[PATCH] libata: finally use __initconst in ata_parse_force_one()

[PATCH] libata: finally use __initconst in ata_parse_force_one()

[Rasmus Villemoes]

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>
---
 drivers/ata/libata-core.c | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 577849c6611a..9581e6f6cd0e 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 },
-- 
2.1.3

Re: [PATCH] libata: finally use __initconst in ata_parse_force_one()

[Tejun Heo]

On Tue, Jun 09, 2015 at 03:33:19PM +0200, Rasmus Villemoes wrote:
> 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.

Heh, seriously.

Applied to libata/for-4.2.

Thanks!

-- 
tejun