Patchwork [25/25] can: mpc5xxx_can: make data used as *of_device_id.data const

login
register
mail settings
Submitter Uwe Kleine-König
Date July 23, 2012, 9:13 a.m.
Message ID <1343034810-3386-26-git-send-email-u.kleine-koenig@pengutronix.de>
Download mbox | patch
Permalink /patch/172609/
State New
Headers show

Comments

Uwe Kleine-König - July 23, 2012, 9:13 a.m.
From: Arnd Bergmann <arnd@arndb.de>

[ukl: split Arnd's patch by driver]

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/net/can/mscan/mpc5xxx_can.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
Marc Kleine-Budde - July 23, 2012, 9:20 a.m.
On 07/23/2012 11:13 AM, Uwe Kleine-König wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> [ukl: split Arnd's patch by driver]
> 
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Marc Kleine-Budde <mkl@pengutronix.de>

Marc

> ---
>  drivers/net/can/mscan/mpc5xxx_can.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
> index 06adf88..8a8df82 100644
> --- a/drivers/net/can/mscan/mpc5xxx_can.c
> +++ b/drivers/net/can/mscan/mpc5xxx_can.c
> @@ -380,12 +380,12 @@ static int mpc5xxx_can_resume(struct platform_device *ofdev)
>  }
>  #endif
>  
> -static struct mpc5xxx_can_data __devinitdata mpc5200_can_data = {
> +static const struct mpc5xxx_can_data __devinitdata mpc5200_can_data = {
>  	.type = MSCAN_TYPE_MPC5200,
>  	.get_clock = mpc52xx_can_get_clock,
>  };
>  
> -static struct mpc5xxx_can_data __devinitdata mpc5121_can_data = {
> +static const struct mpc5xxx_can_data __devinitdata mpc5121_can_data = {
>  	.type = MSCAN_TYPE_MPC5121,
>  	.get_clock = mpc512x_can_get_clock,
>  };
>

Patch

diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
index 06adf88..8a8df82 100644
--- a/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -380,12 +380,12 @@  static int mpc5xxx_can_resume(struct platform_device *ofdev)
 }
 #endif
 
-static struct mpc5xxx_can_data __devinitdata mpc5200_can_data = {
+static const struct mpc5xxx_can_data __devinitdata mpc5200_can_data = {
 	.type = MSCAN_TYPE_MPC5200,
 	.get_clock = mpc52xx_can_get_clock,
 };
 
-static struct mpc5xxx_can_data __devinitdata mpc5121_can_data = {
+static const struct mpc5xxx_can_data __devinitdata mpc5121_can_data = {
 	.type = MSCAN_TYPE_MPC5121,
 	.get_clock = mpc512x_can_get_clock,
 };