Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cf437a0 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde
Browse files

can: mpc5xxx_can: fix section type conflict 



Since commit:
    6d99c4c5 can: mpc5xxx_can: make data used as *of_device_id.data const

both "struct mpc5xxx_can_data mpc5200_can_data" and "mpc5121_can_data" are
marked as "const" but also as "__devinitdata". This leads to the following
compile error:

drivers/net/can/mscan/mpc5xxx_can.c:383: error: mpc5200_can_data causes a section type conflict
drivers/net/can/mscan/mpc5xxx_can.c:383: error: mpc5200_can_data causes a section type conflict
drivers/net/can/mscan/mpc5xxx_can.c:388: error: mpc5121_can_data causes a section type conflict
drivers/net/can/mscan/mpc5xxx_can.c:388: error: mpc5121_can_data causes a section type conflict

This patch changes the "__devinitdata" to "__devinitconst" and marks the
"struct of_device_id mpc5xxx_can_table" as "const" and "__devinitconst", too.

Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
parent ba9b6f9f

drivers/net/can/mscan/mpc5xxx_can.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -247,7 +247,7 @@ static u32 __devinit mpc512x_can_get_clock(struct platform_device *ofdev, 
}

}

#endif /* CONFIG_PPC_MPC512x */

#endif /* CONFIG_PPC_MPC512x */





static struct of_device_id mpc5xxx_can_table[];

static const struct of_device_id mpc5xxx_can_table[];

static int __devinit mpc5xxx_can_probe(struct platform_device *ofdev)

static int __devinit mpc5xxx_can_probe(struct platform_device *ofdev)

{

{

	const struct of_device_id *match;

	const struct of_device_id *match;
@@ -380,17 +380,17 @@ static int mpc5xxx_can_resume(struct platform_device *ofdev) 
}

}

#endif

#endif





static const struct mpc5xxx_can_data __devinitdata mpc5200_can_data = {

static const struct mpc5xxx_can_data __devinitconst mpc5200_can_data = {

	.type = MSCAN_TYPE_MPC5200,

	.type = MSCAN_TYPE_MPC5200,

	.get_clock = mpc52xx_can_get_clock,

	.get_clock = mpc52xx_can_get_clock,

};

};





static const struct mpc5xxx_can_data __devinitdata mpc5121_can_data = {

static const struct mpc5xxx_can_data __devinitconst mpc5121_can_data = {

	.type = MSCAN_TYPE_MPC5121,

	.type = MSCAN_TYPE_MPC5121,

	.get_clock = mpc512x_can_get_clock,

	.get_clock = mpc512x_can_get_clock,

};

};





static struct of_device_id __devinitdata mpc5xxx_can_table[] = {

static const struct of_device_id __devinitconst mpc5xxx_can_table[] = {

	{ .compatible = "fsl,mpc5200-mscan", .data = &mpc5200_can_data, },

	{ .compatible = "fsl,mpc5200-mscan", .data = &mpc5200_can_data, },

	/* Note that only MPC5121 Rev. 2 (and later) is supported */

	/* Note that only MPC5121 Rev. 2 (and later) is supported */

	{ .compatible = "fsl,mpc5121-mscan", .data = &mpc5121_can_data, },

	{ .compatible = "fsl,mpc5121-mscan", .data = &mpc5121_can_data, },