diff options
| author | Rasmus Villemoes <linux@rasmusvillemoes.dk> | 2015-06-09 16:33:19 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2015-06-10 07:45:27 +0300 |
| commit | 0f5f264b38122b39cfa0beb65eef6b5ccac94917 (patch) | |
| tree | 4e2f7776c8a563bac8714c8e7a76fcaf3e0ee724 /drivers/ata | |
| parent | a73ed35052ca85ff627cf9646760b2a7d69ec5c8 (diff) | |
| download | linux-0f5f264b38122b39cfa0beb65eef6b5ccac94917.tar.xz | |
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.c | 7 |
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, 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 }, |