Patchwork can: mpc5xxx_can.c: Fix build failure

login
register
mail settings
Submitter Anatolij Gustschin
Date May 31, 2010, 4:31 p.m.
Message ID <1275323499-15543-1-git-send-email-agust@denx.de>
Download mbox | patch
Permalink /patch/54114/
State Superseded
Delegated to: David Miller
Headers show

Comments

Anatolij Gustschin - May 31, 2010, 4:31 p.m.
Fixes build error caused by the OF device_node pointer
being moved into struct device.

Signed-off-by: Anatolij Gustschin <agust@denx.de>
Cc: Wolfgang Grandegger <wg@grandegger.com>
Cc: Grant Likely <grant.likely@secretlab.ca>
---
 drivers/net/can/mscan/mpc5xxx_can.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
Wolfgang Grandegger - May 31, 2010, 6:27 p.m.
Hi Anatolij,

On 05/31/2010 06:31 PM, Anatolij Gustschin wrote:
> Fixes build error caused by the OF device_node pointer
> being moved into struct device.
> 
> Signed-off-by: Anatolij Gustschin <agust@denx.de>
> Cc: Wolfgang Grandegger <wg@grandegger.com>
> Cc: Grant Likely <grant.likely@secretlab.ca>
> ---
>  drivers/net/can/mscan/mpc5xxx_can.c |    8 ++++----
>  1 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
> index 8af8442..f48deaf 100644
> --- a/drivers/net/can/mscan/mpc5xxx_can.c
> +++ b/drivers/net/can/mscan/mpc5xxx_can.c
> @@ -152,7 +152,7 @@ static u32 __devinit mpc512x_can_get_clock(struct of_device *ofdev,
>  	}
>  
>  	/* Determine the MSCAN device index from the physical address */
> -	pval = of_get_property(ofdev->node, "reg", &plen);
> +	pval = of_get_property(ofdev->dev.of_node, "reg", &plen);
>  	BUG_ON(!pval || plen < sizeof(*pval));
>  	clockidx = (*pval & 0x80) ? 1 : 0;
>  	if (*pval & 0x2000)
> @@ -168,11 +168,11 @@ static u32 __devinit mpc512x_can_get_clock(struct of_device *ofdev,
>  	 */
>  	if (clock_name && !strcmp(clock_name, "ip")) {
>  		*mscan_clksrc = MSCAN_CLKSRC_IPS;
> -		freq = mpc5xxx_get_bus_frequency(ofdev->node);
> +		freq = mpc5xxx_get_bus_frequency(ofdev->dev.of_node);
>  	} else {
>  		*mscan_clksrc = MSCAN_CLKSRC_BUS;
>  
> -		pval = of_get_property(ofdev->node,
> +		pval = of_get_property(ofdev->dev.of_node,
>  				       "fsl,mscan-clock-divider", &plen);
>  		if (pval && plen == sizeof(*pval))
>  			clockdiv = *pval;
> @@ -251,7 +251,7 @@ static int __devinit mpc5xxx_can_probe(struct of_device *ofdev,
>  				       const struct of_device_id *id)
>  {
>  	struct mpc5xxx_can_data *data = (struct mpc5xxx_can_data *)id->data;
> -	struct device_node *np = ofdev->node;
> +	struct device_node *np = ofdev->dev.of_node;
>  	struct net_device *dev;
>  	struct mscan_priv *priv;
>  	void __iomem *base;

The patch seems incomplete. I get at least one more warning (because
I'm compiling for 52xx, I guess):

  CC      drivers/net/can/mscan/mpc5xxx_can.o
drivers/net/can/mscan/mpc5xxx_can.c: In function 'mpc52xx_can_get_clock':
drivers/net/can/mscan/mpc5xxx_can.c:76: error: 'struct of_device' has no member named 'node'

Should I send v2? Thanks for fixing that. I also checked the
sja1000_of_platform driver,  which was converted correctly.

Wolfgang.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Anatolij Gustschin - May 31, 2010, 6:54 p.m.
Hi Wolfgang,

On Mon, 31 May 2010 20:27:01 +0200
Wolfgang Grandegger <wg@grandegger.com> wrote:
...
> > @@ -251,7 +251,7 @@ static int __devinit mpc5xxx_can_probe(struct of_device *ofdev,
> >  				       const struct of_device_id *id)
> >  {
> >  	struct mpc5xxx_can_data *data = (struct mpc5xxx_can_data *)id->data;
> > -	struct device_node *np = ofdev->node;
> > +	struct device_node *np = ofdev->dev.of_node;
> >  	struct net_device *dev;
> >  	struct mscan_priv *priv;
> >  	void __iomem *base;
> 
> The patch seems incomplete. I get at least one more warning (because
> I'm compiling for 52xx, I guess):

Yes, this is true. Unfortunately I didn't compile for 5200 and the issue
didn't show up.

>   CC      drivers/net/can/mscan/mpc5xxx_can.o
> drivers/net/can/mscan/mpc5xxx_can.c: In function 'mpc52xx_can_get_clock':
> drivers/net/can/mscan/mpc5xxx_can.c:76: error: 'struct of_device' has no member named 'node'
> 
> Should I send v2? Thanks for fixing that. I also checked the
> sja1000_of_platform driver,  which was converted correctly.

I will send v2 patch shortly. Thanks for reporting!

Anatolij
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Wolfgang Grandegger - June 1, 2010, 6:20 a.m.
On 05/31/2010 08:27 PM, Wolfgang Grandegger wrote:
> Hi Anatolij,
> 
> On 05/31/2010 06:31 PM, Anatolij Gustschin wrote:
>> Fixes build error caused by the OF device_node pointer
>> being moved into struct device.
>>
>> Signed-off-by: Anatolij Gustschin <agust@denx.de>
>> Cc: Wolfgang Grandegger <wg@grandegger.com>
>> Cc: Grant Likely <grant.likely@secretlab.ca>

Acked-by: Wolfgang Grandegger <wg@grandegger.com>

Thanks,

Wolfgang.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
David Miller - June 1, 2010, 7:11 a.m.
From: Wolfgang Grandegger <wg@grandegger.com>
Date: Tue, 01 Jun 2010 08:20:50 +0200

> On 05/31/2010 08:27 PM, Wolfgang Grandegger wrote:
>> Hi Anatolij,
>> 
>> On 05/31/2010 06:31 PM, Anatolij Gustschin wrote:
>>> Fixes build error caused by the OF device_node pointer
>>> being moved into struct device.
>>>
>>> Signed-off-by: Anatolij Gustschin <agust@denx.de>
>>> Cc: Wolfgang Grandegger <wg@grandegger.com>
>>> Cc: Grant Likely <grant.likely@secretlab.ca>
> 
> Acked-by: Wolfgang Grandegger <wg@grandegger.com>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
index 8af8442..f48deaf 100644
--- a/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -152,7 +152,7 @@  static u32 __devinit mpc512x_can_get_clock(struct of_device *ofdev,
 	}
 
 	/* Determine the MSCAN device index from the physical address */
-	pval = of_get_property(ofdev->node, "reg", &plen);
+	pval = of_get_property(ofdev->dev.of_node, "reg", &plen);
 	BUG_ON(!pval || plen < sizeof(*pval));
 	clockidx = (*pval & 0x80) ? 1 : 0;
 	if (*pval & 0x2000)
@@ -168,11 +168,11 @@  static u32 __devinit mpc512x_can_get_clock(struct of_device *ofdev,
 	 */
 	if (clock_name && !strcmp(clock_name, "ip")) {
 		*mscan_clksrc = MSCAN_CLKSRC_IPS;
-		freq = mpc5xxx_get_bus_frequency(ofdev->node);
+		freq = mpc5xxx_get_bus_frequency(ofdev->dev.of_node);
 	} else {
 		*mscan_clksrc = MSCAN_CLKSRC_BUS;
 
-		pval = of_get_property(ofdev->node,
+		pval = of_get_property(ofdev->dev.of_node,
 				       "fsl,mscan-clock-divider", &plen);
 		if (pval && plen == sizeof(*pval))
 			clockdiv = *pval;
@@ -251,7 +251,7 @@  static int __devinit mpc5xxx_can_probe(struct of_device *ofdev,
 				       const struct of_device_id *id)
 {
 	struct mpc5xxx_can_data *data = (struct mpc5xxx_can_data *)id->data;
-	struct device_node *np = ofdev->node;
+	struct device_node *np = ofdev->dev.of_node;
 	struct net_device *dev;
 	struct mscan_priv *priv;
 	void __iomem *base;