Skip to contentSkip to conversation

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

PATCH In review Grant Likely 3 participants 4 messages Jun 2, 2010 – Jun 3, 2010 1 message not in the archive

Subsystems (3)
USB Arm/Zynq architecture USB ehci driver
lore
Share & tools
lore

Grant Likely

author Applied
#0 lore raw

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

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/[email protected]>
Reported-by John Linn <[email protected]>
CC Greg Kroah-Hartman <[email protected]>
CC Alan Stern <stern-nwvwT67g6+6dFdvTe/[email protected]>
CC [email protected]
CC devicetree-discuss-uLR06cmDAlY/[email protected]

---

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(-)
drivers/usb/host/ehci-xilinx-of.c +1 -1
index 013972b..4899f45 100644
@@ -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 [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html

Acked-by on v1 1/1
#1 lore raw
Quoted 11 lines · 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/[email protected]>
Reported-by John Linn <[email protected]>
CC Greg Kroah-Hartman <[email protected]>
CC Alan Stern <stern-nwvwT67g6+6dFdvTe/[email protected]>
CC [email protected]
CC devicetree-discuss-uLR06cmDAlY/[email protected]
Quoted 3 lines

---

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

Fine with me, feel free to add:

Acked-by Greg Kroah-Hartman <[email protected]>

if you can and send it off to Linus.

thanks,

greg k-h

#2 lore raw
In reply to Grant Likely

Hello.

Quoted 2 lines · 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

This line shouldn't be there. :-)

Quoted 5 lines

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

Signed-off-by Grant Likely <grant.likely-s3s/[email protected]>
Reported-by John Linn <[email protected]>

WBR, Sergei

A message that is not in the archive (sent off-list or not yet received): [email protected]

author
#4 lore raw
Quoted 8 lines · Sergei Shtylyov

Hello.

Quoted 2 lines · 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

  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.