* [PATCH] can: mpc5xxx_can.c: Fix build failure
@ 2010-05-31 16:31 Anatolij Gustschin
2010-05-31 18:27 ` Wolfgang Grandegger
2010-05-31 18:56 ` [PATCH v2] " Anatolij Gustschin
0 siblings, 2 replies; 6+ messages in thread
From: Anatolij Gustschin @ 2010-05-31 16:31 UTC (permalink / raw)
To: netdev, socketcan-core
Cc: David S. Miller, Anatolij Gustschin, Wolfgang Grandegger,
Grant Likely
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;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] can: mpc5xxx_can.c: Fix build failure
2010-05-31 16:31 [PATCH] can: mpc5xxx_can.c: Fix build failure Anatolij Gustschin
@ 2010-05-31 18:27 ` Wolfgang Grandegger
2010-05-31 18:54 ` Anatolij Gustschin
[not found] ` <4C03FF75.3010208-5Yr1BZd7O62+XT7JhA+gdA@public.gmane.org>
2010-05-31 18:56 ` [PATCH v2] " Anatolij Gustschin
1 sibling, 2 replies; 6+ messages in thread
From: Wolfgang Grandegger @ 2010-05-31 18:27 UTC (permalink / raw)
To: Anatolij Gustschin; +Cc: netdev, socketcan-core, David S. Miller, Grant Likely
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] can: mpc5xxx_can.c: Fix build failure
2010-05-31 18:27 ` Wolfgang Grandegger
@ 2010-05-31 18:54 ` Anatolij Gustschin
[not found] ` <4C03FF75.3010208-5Yr1BZd7O62+XT7JhA+gdA@public.gmane.org>
1 sibling, 0 replies; 6+ messages in thread
From: Anatolij Gustschin @ 2010-05-31 18:54 UTC (permalink / raw)
To: Wolfgang Grandegger; +Cc: netdev, socketcan-core, David S. Miller, Grant Likely
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v2] can: mpc5xxx_can.c: Fix build failure
2010-05-31 16:31 [PATCH] can: mpc5xxx_can.c: Fix build failure Anatolij Gustschin
2010-05-31 18:27 ` Wolfgang Grandegger
@ 2010-05-31 18:56 ` Anatolij Gustschin
1 sibling, 0 replies; 6+ messages in thread
From: Anatolij Gustschin @ 2010-05-31 18:56 UTC (permalink / raw)
To: netdev, socketcan-core
Cc: David S. Miller, Anatolij Gustschin, Wolfgang Grandegger,
Grant Likely
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>
---
v1 -> v2:
- also fix building for mpc5200 which also didn't work
as reported by Wolfgang.
drivers/net/can/mscan/mpc5xxx_can.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
index 8af8442..af75393 100644
--- a/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -73,7 +73,7 @@ static u32 __devinit mpc52xx_can_get_clock(struct of_device *ofdev,
else
*mscan_clksrc = MSCAN_CLKSRC_XTAL;
- freq = mpc5xxx_get_bus_frequency(ofdev->node);
+ freq = mpc5xxx_get_bus_frequency(ofdev->dev.of_node);
if (!freq)
return 0;
@@ -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;
--
1.7.0.4
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] can: mpc5xxx_can.c: Fix build failure
[not found] ` <4C03FF75.3010208-5Yr1BZd7O62+XT7JhA+gdA@public.gmane.org>
@ 2010-06-01 6:20 ` Wolfgang Grandegger
2010-06-01 7:11 ` David Miller
0 siblings, 1 reply; 6+ messages in thread
From: Wolfgang Grandegger @ 2010-06-01 6:20 UTC (permalink / raw)
To: Anatolij Gustschin
Cc: socketcan-core-0fE9KPoRgkgATYTw5x5z8w,
netdev-u79uwXL29TY76Z2rM5mHXA, David S. Miller, Grant Likely
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-ynQEQJNshbs@public.gmane.org>
>> Cc: Wolfgang Grandegger <wg-5Yr1BZd7O62+XT7JhA+gdA@public.gmane.org>
>> Cc: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
Acked-by: Wolfgang Grandegger <wg-5Yr1BZd7O62+XT7JhA+gdA@public.gmane.org>
Thanks,
Wolfgang.
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] can: mpc5xxx_can.c: Fix build failure
2010-06-01 6:20 ` Wolfgang Grandegger
@ 2010-06-01 7:11 ` David Miller
0 siblings, 0 replies; 6+ messages in thread
From: David Miller @ 2010-06-01 7:11 UTC (permalink / raw)
To: wg; +Cc: agust, socketcan-core, netdev, grant.likely
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.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2010-06-01 7:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-05-31 16:31 [PATCH] can: mpc5xxx_can.c: Fix build failure Anatolij Gustschin
2010-05-31 18:27 ` Wolfgang Grandegger
2010-05-31 18:54 ` Anatolij Gustschin
[not found] ` <4C03FF75.3010208-5Yr1BZd7O62+XT7JhA+gdA@public.gmane.org>
2010-06-01 6:20 ` Wolfgang Grandegger
2010-06-01 7:11 ` David Miller
2010-05-31 18:56 ` [PATCH v2] " Anatolij Gustschin
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).