linux-can.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 18/25] can: mpc5xxx_can: make data in mpc5xxx_can_probe const
       [not found] <1343034810-3386-1-git-send-email-u.kleine-koenig@pengutronix.de>
@ 2012-07-23  9:13 ` Uwe Kleine-König
  2012-07-23  9:17   ` Marc Kleine-Budde
  2012-07-23  9:13 ` [PATCH 25/25] can: mpc5xxx_can: make data used as *of_device_id.data const Uwe Kleine-König
  1 sibling, 1 reply; 4+ messages in thread
From: Uwe Kleine-König @ 2012-07-23  9:13 UTC (permalink / raw)
  To: Grant Likely, Arnd Bergmann, Rob Herring, Oliver Hartkopp
  Cc: kernel, linux-arm-kernel, Marc Kleine-Budde, linux-can

From: Marc Kleine-Budde <mkl@pengutronix.de>

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
---
 drivers/net/can/mscan/mpc5xxx_can.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
index 5caa572..06adf88 100644
--- a/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -251,7 +251,7 @@ static struct of_device_id mpc5xxx_can_table[];
 static int __devinit mpc5xxx_can_probe(struct platform_device *ofdev)
 {
 	const struct of_device_id *match;
-	struct mpc5xxx_can_data *data;
+	const struct mpc5xxx_can_data *data;
 	struct device_node *np = ofdev->dev.of_node;
 	struct net_device *dev;
 	struct mscan_priv *priv;
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [PATCH 25/25] can: mpc5xxx_can: make data used as *of_device_id.data const
       [not found] <1343034810-3386-1-git-send-email-u.kleine-koenig@pengutronix.de>
  2012-07-23  9:13 ` [PATCH 18/25] can: mpc5xxx_can: make data in mpc5xxx_can_probe const Uwe Kleine-König
@ 2012-07-23  9:13 ` Uwe Kleine-König
  2012-07-23  9:20   ` Marc Kleine-Budde
  1 sibling, 1 reply; 4+ messages in thread
From: Uwe Kleine-König @ 2012-07-23  9:13 UTC (permalink / raw)
  To: Grant Likely, Arnd Bergmann, Rob Herring, Oliver Hartkopp,
	Marc Kleine-Budde
  Cc: kernel, linux-arm-kernel, linux-can

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(-)

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,
 };
-- 
1.7.10.4


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* Re: [PATCH 18/25] can: mpc5xxx_can: make data in mpc5xxx_can_probe const
  2012-07-23  9:13 ` [PATCH 18/25] can: mpc5xxx_can: make data in mpc5xxx_can_probe const Uwe Kleine-König
@ 2012-07-23  9:17   ` Marc Kleine-Budde
  0 siblings, 0 replies; 4+ messages in thread
From: Marc Kleine-Budde @ 2012-07-23  9:17 UTC (permalink / raw)
  To: Uwe Kleine-König
  Cc: Grant Likely, Arnd Bergmann, Rob Herring, Oliver Hartkopp, kernel,
	linux-arm-kernel, linux-can

[-- Attachment #1: Type: text/plain, Size: 1363 bytes --]

On 07/23/2012 11:13 AM, Uwe Kleine-König wrote:
> From: Marc Kleine-Budde <mkl@pengutronix.de>
> 
> Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>
> Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

Note: this patch is already upstream in David Miller's net-next tree.
0e84eb0 can: mpc5xxx_can: make data in mpc5xxx_can_probe const

cheers, Marc
> ---
>  drivers/net/can/mscan/mpc5xxx_can.c |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
> index 5caa572..06adf88 100644
> --- a/drivers/net/can/mscan/mpc5xxx_can.c
> +++ b/drivers/net/can/mscan/mpc5xxx_can.c
> @@ -251,7 +251,7 @@ static struct of_device_id mpc5xxx_can_table[];
>  static int __devinit mpc5xxx_can_probe(struct platform_device *ofdev)
>  {
>  	const struct of_device_id *match;
> -	struct mpc5xxx_can_data *data;
> +	const struct mpc5xxx_can_data *data;
>  	struct device_node *np = ofdev->dev.of_node;
>  	struct net_device *dev;
>  	struct mscan_priv *priv;
> 

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

* Re: [PATCH 25/25] can: mpc5xxx_can: make data used as *of_device_id.data const
  2012-07-23  9:13 ` [PATCH 25/25] can: mpc5xxx_can: make data used as *of_device_id.data const Uwe Kleine-König
@ 2012-07-23  9:20   ` Marc Kleine-Budde
  0 siblings, 0 replies; 4+ messages in thread
From: Marc Kleine-Budde @ 2012-07-23  9:20 UTC (permalink / raw)
  To: Uwe Kleine-König
  Cc: Grant Likely, Arnd Bergmann, Rob Herring, Oliver Hartkopp, kernel,
	linux-arm-kernel, linux-can

[-- Attachment #1: Type: text/plain, Size: 1489 bytes --]

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,
>  };
> 

-- 
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 262 bytes --]

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2012-07-23  9:20 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <1343034810-3386-1-git-send-email-u.kleine-koenig@pengutronix.de>
2012-07-23  9:13 ` [PATCH 18/25] can: mpc5xxx_can: make data in mpc5xxx_can_probe const Uwe Kleine-König
2012-07-23  9:17   ` Marc Kleine-Budde
2012-07-23  9:13 ` [PATCH 25/25] can: mpc5xxx_can: make data used as *of_device_id.data const Uwe Kleine-König
2012-07-23  9:20   ` Marc Kleine-Budde

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).