7 messages, 2 authors, 2012-07-16 · open the first message on its own page
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: 2012-07-13 13:04:28
Hello, my coworker Uwe just posted a series to make of_device_id.data const [1]. This series changes the users of of_device_id.data to const in the CAN tree. Marc [1] http://www.spinics.net/lists/arm-kernel/msg184407.html
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: 2012-07-13 13:04:29
Signed-off-by: Marc Kleine-Budde <mkl@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
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: 2012-07-13 13:04:29
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- drivers/net/can/flexcan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c
index 81324a1..1b6f562 100644
--- a/drivers/net/can/flexcan.c
+++ b/drivers/net/can/flexcan.c@@ -192,7 +192,7 @@ struct flexcan_priv { struct clk *clk; struct flexcan_platform_data *pdata; - struct flexcan_devtype_data *devtype_data; + const struct flexcan_devtype_data *devtype_data; }; static struct flexcan_devtype_data fsl_p1010_devtype_data = {
@@ -960,7 +960,7 @@ static const struct platform_device_id flexcan_id_table[] = { static int __devinit flexcan_probe(struct platform_device *pdev) { const struct of_device_id *of_id; - struct flexcan_devtype_data *devtype_data; + const struct flexcan_devtype_data *devtype_data; struct net_device *dev; struct flexcan_priv *priv; struct resource *mem;
--
1.7.10
From: Uwe Kleine-König <hidden>
Date: 2012-07-16 08:21:46
Hello, On Fri, Jul 13, 2012 at 03:04:23PM +0200, Marc Kleine-Budde wrote:
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- drivers/net/can/flexcan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 81324a1..1b6f562 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c@@ -192,7 +192,7 @@ struct flexcan_priv { struct clk *clk; struct flexcan_platform_data *pdata; - struct flexcan_devtype_data *devtype_data; + const struct flexcan_devtype_data *devtype_data; }; static struct flexcan_devtype_data fsl_p1010_devtype_data = {@@ -960,7 +960,7 @@ static const struct platform_device_id flexcan_id_table[] = { static int __devinit flexcan_probe(struct platform_device *pdev) { const struct of_device_id *of_id; - struct flexcan_devtype_data *devtype_data; + const struct flexcan_devtype_data *devtype_data; struct net_device *dev; struct flexcan_priv *priv; struct resource *mem;
Maybe this can be squashed into 30c1e67 (can: flexcan: add hardware controller version support) (currently in next) together with making fsl_p1010_devtype_data and fsl_imx6q_devtype_data const? Best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ |
From: Marc Kleine-Budde <mkl@pengutronix.de>
Date: 2012-07-16 08:28:31
On 07/16/2012 10:21 AM, Uwe Kleine-König wrote:
Hello, On Fri, Jul 13, 2012 at 03:04:23PM +0200, Marc Kleine-Budde wrote:quoted
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- drivers/net/can/flexcan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 81324a1..1b6f562 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c@@ -192,7 +192,7 @@ struct flexcan_priv { struct clk *clk; struct flexcan_platform_data *pdata; - struct flexcan_devtype_data *devtype_data; + const struct flexcan_devtype_data *devtype_data; }; static struct flexcan_devtype_data fsl_p1010_devtype_data = {@@ -960,7 +960,7 @@ static const struct platform_device_id flexcan_id_table[] = { static int __devinit flexcan_probe(struct platform_device *pdev) { const struct of_device_id *of_id; - struct flexcan_devtype_data *devtype_data; + const struct flexcan_devtype_data *devtype_data; struct net_device *dev; struct flexcan_priv *priv; struct resource *mem;Maybe this can be squashed into 30c1e67 (can: flexcan: add hardware controller version support) (currently in next) together with making fsl_p1010_devtype_data and fsl_imx6q_devtype_data const?
Squashing is not possible, because it's already in David's tree. If I mark fsl_p1010_devtype_data and fsl_imx6q_devtype_data as const, I get these errors: drivers/net/can/flexcan.c:950: warning: initialization discards qualifiers from pointer target type drivers/net/can/flexcan.c:951: warning: initialization discards qualifiers from pointer target type In a tree without you proposed patch. Marc -- 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 |
From: Uwe Kleine-König <hidden>
Date: 2012-07-16 09:50:56
On Mon, Jul 16, 2012 at 10:28:24AM +0200, Marc Kleine-Budde wrote:
On 07/16/2012 10:21 AM, Uwe Kleine-König wrote:quoted
Hello, On Fri, Jul 13, 2012 at 03:04:23PM +0200, Marc Kleine-Budde wrote:quoted
Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de> --- drivers/net/can/flexcan.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)diff --git a/drivers/net/can/flexcan.c b/drivers/net/can/flexcan.c index 81324a1..1b6f562 100644 --- a/drivers/net/can/flexcan.c +++ b/drivers/net/can/flexcan.c@@ -192,7 +192,7 @@ struct flexcan_priv { struct clk *clk; struct flexcan_platform_data *pdata; - struct flexcan_devtype_data *devtype_data; + const struct flexcan_devtype_data *devtype_data; }; static struct flexcan_devtype_data fsl_p1010_devtype_data = {@@ -960,7 +960,7 @@ static const struct platform_device_id flexcan_id_table[] = { static int __devinit flexcan_probe(struct platform_device *pdev) { const struct of_device_id *of_id; - struct flexcan_devtype_data *devtype_data; + const struct flexcan_devtype_data *devtype_data; struct net_device *dev; struct flexcan_priv *priv; struct resource *mem;Maybe this can be squashed into 30c1e67 (can: flexcan: add hardware controller version support) (currently in next) together with making fsl_p1010_devtype_data and fsl_imx6q_devtype_data const?Squashing is not possible, because it's already in David's tree. If I
ok.
mark fsl_p1010_devtype_data and fsl_imx6q_devtype_data as const, I get these errors: drivers/net/can/flexcan.c:950: warning: initialization discards qualifiers from pointer target type drivers/net/can/flexcan.c:951: warning: initialization discards qualifiers from pointer target type In a tree without you proposed patch.
ah, right. My tree is based on v3.5-rc which doesn't have 30c1e67 yet, so I make a mental note to add the consts when both patches hit mainline. Thanks Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ |
From: Uwe Kleine-König <hidden>
Date: 2012-07-13 13:35:25
Hello, On Fri, Jul 13, 2012 at 03:04:22PM +0200, Marc Kleine-Budde wrote:
my coworker Uwe just posted a series to make of_device_id.data const [1]. This series changes the users of of_device_id.data to const in the CAN tree.
Acked-by: Uwe Kleine-König <redacted> Note that even if the series doesn't go in as is (because more users might need fixing) these two patches by Marc are nice independently of actually making of_device_id.data const. Thanks and best regards Uwe -- Pengutronix e.K. | Uwe Kleine-König | Industrial Linux Solutions | http://www.pengutronix.de/ |