[PATCH] of/usb: fix build error due to of_node pointer move

[PATCH] of/usb: fix build error due to of_node pointer move

[Grant Likely]

Fix driver to use new location of of_node pointer (introduced by commit
use new location of of_node pointer (introduced by commit
61c7a080a5a061c976988fd4b844dfb468dda255; of: Always use 'struct
device.of_node' to get device node pointer)

Signed-off-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
Reported-by: John Linn <john.linn-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
CC: Greg Kroah-Hartman <gregkh-l3A5Bk7waGM@public.gmane.org>
CC: Alan Stern <stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org>
CC: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
CC: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
---

I've applied this patch to my merge-devicetree branch

 drivers/usb/host/ehci-xilinx-of.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/host/ehci-xilinx-of.c b/drivers/usb/host/ehci-xilinx-of.c
index 013972b..4899f45 100644
--- a/drivers/usb/host/ehci-xilinx-of.c
+++ b/drivers/usb/host/ehci-xilinx-of.c
@@ -151,7 +151,7 @@ static const struct hc_driver ehci_xilinx_of_hc_driver = {
 static int __devinit
 ehci_hcd_xilinx_of_probe(struct of_device *op, const struct of_device_id *match)
 {
-	struct device_node *dn = op->node;
+	struct device_node *dn = op->dev.of_node;
 	struct usb_hcd *hcd;
 	struct ehci_hcd	*ehci;
 	struct resource res;

--
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] of/usb: fix build error due to of_node pointer move

[Greg KH]

On Wed, Jun 02, 2010 at 01:47:16PM -0600, Grant Likely wrote:
> Fix driver to use new location of of_node pointer (introduced by commit
> use new location of of_node pointer (introduced by commit
> 61c7a080a5a061c976988fd4b844dfb468dda255; of: Always use 'struct
> device.of_node' to get device node pointer)
> 
> Signed-off-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
> Reported-by: John Linn <john.linn-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>
> CC: Greg Kroah-Hartman <gregkh-l3A5Bk7waGM@public.gmane.org>
> CC: Alan Stern <stern-nwvwT67g6+6dFdvTe/nMLpVzexx5G7lz@public.gmane.org>
> CC: linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
> CC: devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
> ---
> 
> I've applied this patch to my merge-devicetree branch

Fine with me, feel free to add:
	Acked-by: Greg Kroah-Hartman <gregkh-l3A5Bk7waGM@public.gmane.org>
if you can and send it off to Linus.

thanks,

greg k-h

Re: [PATCH] of/usb: fix build error due to of_node pointer move

[Sergei Shtylyov]

Hello.

Grant Likely wrote:

> Fix driver to use new location of of_node pointer (introduced by commit
> use new location of of_node pointer (introduced by commit

    This line shouldn't be there. :-)

> 61c7a080a5a061c976988fd4b844dfb468dda255; of: Always use 'struct
> device.of_node' to get device node pointer)

> Signed-off-by: Grant Likely <grant.likely-s3s/WqlpOiPyB63q8FvJNQ@public.gmane.org>
> Reported-by: John Linn <john.linn-gjFFaj9aHVfQT0dZR+AlfA@public.gmane.org>

WBR, Sergei

Re: [PATCH] of/usb: fix build error due to of_node pointer move

[Grant Likely]

On Thu, Jun 3, 2010 at 4:17 AM, Sergei Shtylyov <sshtylyov-Igf4POYTYCDQT0dZR+AlfA@public.gmane.org> wrote:
> Hello.
>
> Grant Likely wrote:
>
>> Fix driver to use new location of of_node pointer (introduced by commit
>> use new location of of_node pointer (introduced by commit
>
>   This line shouldn't be there. :-)

Oops.  minor paper bag moment.

I've already pushed out for Linus to pick it up, so I'll have to live
with the embarrassment of it.  :-/

Thanks,
g.