From: Rasmus Villemoes Date: Tue, 9 Jun 2015 13:33:19 +0000 (+0200) Subject: libata: finally use __initconst in ata_parse_force_one() X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0f5f264b38122b39cfa0beb65eef6b5ccac94917;p=sagit-ice-cold%2Fkernel_xiaomi_msm8998.git libata: finally use __initconst in ata_parse_force_one() Just six days after this FIXME was added seven years ago, Sam Ravnborg added the missing feature (37c514e3dfc8 "Add missing init section definitions"), though it ended up being called __initconst. Let's use it; better late than never. Signed-off-by: Rasmus Villemoes Signed-off-by: Tejun Heo --- diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index 52c640da9d4e..86052e88b65c 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c @@ -6456,12 +6456,7 @@ static int __init ata_parse_force_one(char **cur, struct ata_force_ent *force_ent, const char **reason) { - /* FIXME: Currently, there's no way to tag init const data and - * using __initdata causes build failure on some versions of - * gcc. Once __initdataconst is implemented, add const to the - * following structure. - */ - static struct ata_force_param force_tbl[] __initdata = { + static const struct ata_force_param force_tbl[] __initconst = { { "40c", .cbl = ATA_CBL_PATA40 }, { "80c", .cbl = ATA_CBL_PATA80 }, { "short40c", .cbl = ATA_CBL_PATA40_SHORT },