Adding usb_role_switch_get/set_drvdata() functions that the switch drivers can use for setting and getting private data pointer that is associated with the switch.
Unified · Split
| @@ -329,6 +329,7 @@ usb_role_switch_register(struct device *parent, · 328 unmodified lines | ||
| 329 | 329 | sw->dev.fwnode = desc->fwnode; |
| 330 | 330 | sw->dev.class = role_class; |
| 331 | 331 | sw->dev.type = &usb_role_dev_type; |
| 332 | + dev_set_drvdata(&sw->dev, desc->driver_data); | |
| 332 | 333 | dev_set_name(&sw->dev, "%s-role-switch", dev_name(parent)); |
| 333 | 334 | |
| 334 | 335 | ret = device_register(&sw->dev); |
| @@ -356,6 +357,27 @@ void usb_role_switch_unregister(struct usb_role_switch *sw) · 21 unmodified lines | ||
| 356 | 357 | } |
| 357 | 358 | EXPORT_SYMBOL_GPL(usb_role_switch_unregister); |
| 358 | 359 | |
| 360 | +/** | |
| 361 | + * usb_role_switch_set_drvdata - Assign private data pointer to a switch | |
| 362 | + * @sw: USB Role Switch | |
| 363 | + * @data: Private data pointer | |
| 364 | + */ | |
| 365 | +void usb_role_switch_set_drvdata(struct usb_role_switch *sw, void *data) | |
| 366 | +{ | |
| 367 | + dev_set_drvdata(&sw->dev, data); | |
| 368 | +} | |
| 369 | +EXPORT_SYMBOL_GPL(usb_role_switch_set_drvdata); | |
| 370 | + | |
| 371 | +/** | |
| 372 | + * usb_role_switch_get_drvdata - Get the private data pointer of a switch | |
| 373 | + * @sw: USB Role Switch | |
| 374 | + */ | |
| 375 | +void *usb_role_switch_get_drvdata(struct usb_role_switch *sw) | |
| 376 | +{ | |
| 377 | + return dev_get_drvdata(&sw->dev); | |
| 378 | +} | |
| 379 | +EXPORT_SYMBOL_GPL(usb_role_switch_get_drvdata); | |
| 380 | + | |
| 359 | 381 | static int __init usb_roles_init(void) |
| 360 | 382 | { |
| 361 | 383 | role_class = class_create(THIS_MODULE, "usb_role"); |
| @@ -25,6 +25,7 @@ typedef enum usb_role (*usb_role_switch_get_t)(struct device *dev); · 24 unmodified lines | ||
| 25 | 25 | * @set: Callback for setting the role |
| 26 | 26 | * @get: Callback for getting the role (optional) |
| 27 | 27 | * @allow_userspace_control: If true userspace may change the role through sysfs |
| 28 | + * @driver_data: Private data pointer | |
| 28 | 29 | * |
| 29 | 30 | * @usb2_port and @usb3_port will point to the USB host port and @udc to the USB |
| 30 | 31 | * device controller behind the USB connector with the role switch. If |
| @@ -40,6 +41,7 @@ struct usb_role_switch_desc { · 9 unmodified lines | ||
| 40 | 41 | usb_role_switch_set_t set; |
| 41 | 42 | usb_role_switch_get_t get; |
| 42 | 43 | bool allow_userspace_control; |
| 44 | + void *driver_data; | |
| 43 | 45 | }; |
| 44 | 46 | |
| 45 | 47 | |
| @@ -57,6 +59,9 @@ struct usb_role_switch * · 11 unmodified lines | ||
| 57 | 59 | usb_role_switch_register(struct device *parent, |
| 58 | 60 | const struct usb_role_switch_desc *desc); |
| 59 | 61 | void usb_role_switch_unregister(struct usb_role_switch *sw); |
| 62 | + | |
| 63 | +void usb_role_switch_set_drvdata(struct usb_role_switch *sw, void *data); | |
| 64 | +void *usb_role_switch_get_drvdata(struct usb_role_switch *sw); | |
| 60 | 65 | #else |
| 61 | 66 | static inline int usb_role_switch_set_role(struct usb_role_switch *sw, |
| 62 | 67 | enum usb_role role) |
| @@ -90,6 +95,17 @@ usb_role_switch_register(struct device *parent, · 27 unmodified lines | ||
| 90 | 95 | } |
| 91 | 96 | |
| 92 | 97 | static inline void usb_role_switch_unregister(struct usb_role_switch *sw) { } |
| 98 | + | |
| 99 | +static inline void | |
| 100 | +usb_role_switch_set_drvdata(struct usb_role_switch *sw, void *data) | |
| 101 | +{ | |
| 102 | +} | |
| 103 | + | |
| 104 | +static inline void *usb_role_switch_get_drvdata(struct usb_role_switch *sw) | |
| 105 | +{ | |
| 106 | + return NULL; | |
| 107 | +} | |
| 108 | + | |
| 93 | 109 | #endif |
| 94 | 110 | |
| 95 | 111 | #endif /* __LINUX_USB_ROLE_H */ |