Commitef0f7d1

hadess

authored and

gregkh

committed

USB: Export generic USB device driver functions

This will make it possible to implement device drivers which extend thegeneric driver without needing to reimplement it.Signed-off-by: Bastien Nocera <hadess@hadess.net>Acked-by: Alan Stern <stern@rowland.harvard.edu>Link:https://lore.kernel.org/r/20191016093933.693-2-hadess@hadess.netSigned-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 parent6a9746f commitef0f7d1Copy full SHA for ef0f7d1

File tree

2 files changed

+14

-8

lines changed

drivers/usb/core
- generic.c
- usb.h

2 files changed

+14

-8

lines changed

`‎drivers/usb/core/generic.c‎`

Lines changed: 8 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -195,7 +195,7 @@ int usb_choose_configuration(struct usb_device *udev)`
`195`	`195`	`}`
`196`	`196`	`EXPORT_SYMBOL_GPL(usb_choose_configuration);`
`197`	`197`
`198`		`-staticintgeneric_probe(structusb_device*udev)`
	`198`	`+intusb_generic_driver_probe(structusb_device*udev)`
`199`	`199`	`{`
`200`	`200`	`interr,c;`
`201`	`201`
`@@ -222,7 +222,7 @@ static int generic_probe(struct usb_device *udev)`
`222`	`222`	`return0;`
`223`	`223`	`}`
`224`	`224`
`225`		`-staticvoidgeneric_disconnect(structusb_device*udev)`
	`225`	`+voidusb_generic_driver_disconnect(structusb_device*udev)`
`226`	`226`	`{`
`227`	`227`	`usb_notify_remove_device(udev);`
`228`	`228`
`@@ -234,7 +234,7 @@ static void generic_disconnect(struct usb_device *udev)`
`234`	`234`
`235`	`235`	`#ifdefCONFIG_PM`
`236`	`236`
`237`		`-staticintgeneric_suspend(structusb_device*udev,pm_message_tmsg)`
	`237`	`+intusb_generic_driver_suspend(structusb_device*udev,pm_message_tmsg)`
`238`	`238`	`{`
`239`	`239`	`intrc;`
`240`	`240`
`@@ -262,7 +262,7 @@ static int generic_suspend(struct usb_device *udev, pm_message_t msg)`
`262`	`262`	`returnrc;`
`263`	`263`	`}`
`264`	`264`
`265`		`-staticintgeneric_resume(structusb_device*udev,pm_message_tmsg)`
	`265`	`+intusb_generic_driver_resume(structusb_device*udev,pm_message_tmsg)`
`266`	`266`	`{`
`267`	`267`	`intrc;`
`268`	`268`
`@@ -285,11 +285,11 @@ static int generic_resume(struct usb_device *udev, pm_message_t msg)`
`285`	`285`
`286`	`286`	`structusb_device_driverusb_generic_driver= {`
`287`	`287`	`.name="usb",`
`288`		`-.probe=generic_probe,`
`289`		`-.disconnect=generic_disconnect,`
	`288`	`+.probe=usb_generic_driver_probe,`
	`289`	`+.disconnect=usb_generic_driver_disconnect,`
`290`	`290`	`#ifdefCONFIG_PM`
`291`		`-.suspend=generic_suspend,`
`292`		`-.resume=generic_resume,`
	`291`	`+.suspend=usb_generic_driver_suspend,`
	`292`	`+.resume=usb_generic_driver_resume,`
`293`	`293`	`#endif`
`294`	`294`	`.supports_autosuspend=1,`
`295`	`295`	`};`

`‎drivers/usb/core/usb.h‎`

Lines changed: 6 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,12 @@ extern void usb_release_bos_descriptor(struct usb_device *dev);`
`47`	`47`	`externcharusb_cache_string(structusb_deviceudev,intindex);`
`48`	`48`	`externintusb_set_configuration(structusb_device*dev,intconfiguration);`
`49`	`49`	`externintusb_choose_configuration(structusb_device*udev);`
	`50`	`+externintusb_generic_driver_probe(structusb_device*udev);`
	`51`	`+externvoidusb_generic_driver_disconnect(structusb_device*udev);`
	`52`	`+externintusb_generic_driver_suspend(structusb_device*udev,`
	`53`	`+pm_message_tmsg);`
	`54`	`+externintusb_generic_driver_resume(structusb_device*udev,`
	`55`	`+pm_message_tmsg);`
`50`	`56`
`51`	`57`	`staticinlineunsignedusb_get_max_power(structusb_device*udev,`
`52`	`58`	`structusb_host_config*c)`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commitef0f7d1

File tree

2 files changed

2 files changed

`‎drivers/usb/core/generic.c‎`

`‎drivers/usb/core/usb.h‎`

0 commit comments