Move driver data directly into struct usb_gadget {} in preparation for
conversion of struct device to struct udevice * in struct usb_gadget.

Signed-off-by: Marek Vasut <[email protected]>
---
Cc: Linus Walleij <[email protected]>
Cc: Lukasz Majewski <[email protected]>
Cc: Mattijs Korpershoek <[email protected]>
Cc: Miquel Raynal <[email protected]>
Cc: Neil Armstrong <[email protected]>
Cc: Nishanth Menon <[email protected]>
Cc: Zixun LI <[email protected]>
---
 include/linux/usb/gadget.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
index d62fba0ca02..a2b8520bc99 100644
--- a/include/linux/usb/gadget.h
+++ b/include/linux/usb/gadget.h
@@ -544,17 +544,18 @@ struct usb_gadget {
        unsigned                        a_alt_hnp_support:1;
        const char                      *name;
        struct device                   dev;
+       void                            *driver_data;
        unsigned                        quirk_ep_out_aligned_size:1;
 };
 
 static inline void set_gadget_data(struct usb_gadget *gadget, void *data)
 {
-       gadget->dev.driver_data = data;
+       gadget->driver_data = data;
 }
 
 static inline void *get_gadget_data(struct usb_gadget *gadget)
 {
-       return gadget->dev.driver_data;
+       return gadget->driver_data;
 }
 
 static inline struct usb_gadget *dev_to_usb_gadget(struct device *dev)
-- 
2.45.2

Reply via email to