Re: [PATCH 1/2] can: flexcan: make flexcan_priv.devtype_data member point to const data

["Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>]

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:
> > 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?
> 
> 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/  |