aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ata
diff options
context:
space:
mode:
authorRasmus Villemoes <linux@rasmusvillemoes.dk>2015-06-09 09:33:19 -0400
committerTejun Heo <tj@kernel.org>2015-06-10 00:45:27 -0400
commit0f5f264b38122b39cfa0beb65eef6b5ccac94917 (patch)
tree4e2f7776c8a563bac8714c8e7a76fcaf3e0ee724 /drivers/ata
parenta73ed35052ca85ff627cf9646760b2a7d69ec5c8 (diff)
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 <linux@rasmusvillemoes.dk> Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata')
-rw-r--r--drivers/ata/libata-core.c7
1 files changed, 1 insertions, 6 deletions
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,
6456 struct ata_force_ent *force_ent, 6456 struct ata_force_ent *force_ent,
6457 const char **reason) 6457 const char **reason)
6458{ 6458{
6459 /* FIXME: Currently, there's no way to tag init const data and 6459 static const struct ata_force_param force_tbl[] __initconst = {
6460 * using __initdata causes build failure on some versions of
6461 * gcc. Once __initdataconst is implemented, add const to the
6462 * following structure.
6463 */
6464 static struct ata_force_param force_tbl[] __initdata = {
6465 { "40c", .cbl = ATA_CBL_PATA40 }, 6460 { "40c", .cbl = ATA_CBL_PATA40 },
6466 { "80c", .cbl = ATA_CBL_PATA80 }, 6461 { "80c", .cbl = ATA_CBL_PATA80 },
6467 { "short40c", .cbl = ATA_CBL_PATA40_SHORT }, 6462 { "short40c", .cbl = ATA_CBL_PATA40_SHORT },