From 0c3d1076afd76cb7b6cb878db1d76f203cea5c44 Mon Sep 17 00:00:00 2001
From: Matthew Wilcox <willy@linux.intel.com>
Date: Fri, 30 Apr 2010 13:11:30 -0600
Subject: [PATCH] --- yaml --- r: 195432 b: refs/heads/master c:
 1e429018b646bdf903554e92ead1cda96cc552dc h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/include/linux/usb.h | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index cd86aa5b333f..ae858b04886e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fe54b058de9d1df5fef9e2a559651f4b7c9f04b1
+refs/heads/master: 1e429018b646bdf903554e92ead1cda96cc552dc
diff --git a/trunk/include/linux/usb.h b/trunk/include/linux/usb.h
index fd7d61e58198..cf3b289a87a2 100644
--- a/trunk/include/linux/usb.h
+++ b/trunk/include/linux/usb.h
@@ -184,8 +184,6 @@ struct usb_interface {
 	struct work_struct reset_ws;	/* for resets in atomic context */
 };
 #define	to_usb_interface(d) container_of(d, struct usb_interface, dev)
-#define	interface_to_usbdev(intf) \
-	container_of(intf->dev.parent, struct usb_device, dev)
 
 static inline void *usb_get_intfdata(struct usb_interface *intf)
 {
@@ -493,6 +491,11 @@ struct usb_device {
 };
 #define	to_usb_device(d) container_of(d, struct usb_device, dev)
 
+static inline struct usb_device *interface_to_usbdev(struct usb_interface *intf)
+{
+	return to_usb_device(intf->dev.parent);
+}
+
 extern struct usb_device *usb_get_dev(struct usb_device *dev);
 extern void usb_put_dev(struct usb_device *dev);