diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-05 00:28:47 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-09-05 00:28:47 -0700 |
| commit | 5147a136f3ade69b9ce12afc022b1c37d43cf5d8 (patch) | |
| tree | a33af1b06f2000ab82cc0527442de108c668843c /usb | |
| parent | eea487fa0daadea3dbe2c25b9db5881976643e09 (diff) | |
| parent | 470ec5b9affc1625ee67df9e74701e51973d7cdf (diff) | |
| download | patches-5147a136f3ade69b9ce12afc022b1c37d43cf5d8.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/gregkh/patches
Conflicts:
series
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-gadget-don-t-save-bind-callback-in-struct-usb_composite_driver.patch | 21 | ||||
| -rw-r--r-- | usb/usb-langwell-remove-unnecessary-return-s-from-void-functions.patch | 68 |
2 files changed, 87 insertions, 2 deletions
diff --git a/usb/usb-gadget-don-t-save-bind-callback-in-struct-usb_composite_driver.patch b/usb/usb-gadget-don-t-save-bind-callback-in-struct-usb_composite_driver.patch index 779a690b66869c..7acafd62337a40 100644 --- a/usb/usb-gadget-don-t-save-bind-callback-in-struct-usb_composite_driver.patch +++ b/usb/usb-gadget-don-t-save-bind-callback-in-struct-usb_composite_driver.patch @@ -15,7 +15,6 @@ This fixes many section mismatches reported by modpost. Signed-off-by: Michał Nazarewicz <m.nazarewicz@samsung.com> Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> - --- drivers/usb/gadget/audio.c | 3 +-- drivers/usb/gadget/cdc2.c | 3 +-- @@ -25,11 +24,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/usb/gadget/hid.c | 3 +-- drivers/usb/gadget/mass_storage.c | 3 +-- drivers/usb/gadget/multi.c | 3 +-- + drivers/usb/gadget/nokia.c | 3 +-- drivers/usb/gadget/serial.c | 3 +-- drivers/usb/gadget/webcam.c | 3 +-- drivers/usb/gadget/zero.c | 3 +-- include/linux/usb/composite.h | 19 +++++-------------- - 12 files changed, 26 insertions(+), 38 deletions(-) + 13 files changed, 27 insertions(+), 40 deletions(-) --- a/drivers/usb/gadget/audio.c +++ b/drivers/usb/gadget/audio.c @@ -216,6 +216,23 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } module_init(multi_init); +--- a/drivers/usb/gadget/nokia.c ++++ b/drivers/usb/gadget/nokia.c +@@ -241,13 +241,12 @@ static struct usb_composite_driver nokia + .name = "g_nokia", + .dev = &device_desc, + .strings = dev_strings, +- .bind = nokia_bind, + .unbind = __exit_p(nokia_unbind), + }; + + static int __init nokia_init(void) + { +- return usb_composite_register(&nokia_driver); ++ return usb_composite_probe(&nokia_driver, nokia_bind); + } + module_init(nokia_init); + --- a/drivers/usb/gadget/serial.c +++ b/drivers/usb/gadget/serial.c @@ -242,7 +242,6 @@ static struct usb_composite_driver gseri diff --git a/usb/usb-langwell-remove-unnecessary-return-s-from-void-functions.patch b/usb/usb-langwell-remove-unnecessary-return-s-from-void-functions.patch new file mode 100644 index 00000000000000..fcdce57534c3c3 --- /dev/null +++ b/usb/usb-langwell-remove-unnecessary-return-s-from-void-functions.patch @@ -0,0 +1,68 @@ +From jkosina@suse.cz Thu Sep 2 13:04:41 2010 +Date: Thu, 2 Sep 2010 16:34:36 +0200 (CEST) +From: Jiri Kosina <jkosina@suse.cz> +To: Greg KH <greg@kroah.com> +Cc: Stephen Rothwell <sfr@canb.auug.org.au>, + linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, + JiebingLi <jiebing.li@intel.com>, Joe Perches <joe@perches.com> +Subject: USB: langwell: Remove unnecessary return's from void functions +Message-ID: <alpine.LNX.2.00.1009021633020.26813@pobox.suse.cz> + +From: Joe Perches <joe@perches.com> + +There are about 2500 void functions in drivers/usb +Only a few used return; at end of function. + +Standardize them a bit. + +Signed-off-by: Joe Perches <joe@perches.com> +Signed-off-by: Jiri Kosina <jkosina@suse.cz> +Cc: Stephen Rothwell <sfr@canb.auug.org.au> +Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> + +--- + drivers/usb/gadget/langwell_udc.c | 5 ----- + 1 file changed, 5 deletions(-) + +--- a/drivers/usb/gadget/langwell_udc.c ++++ b/drivers/usb/gadget/langwell_udc.c +@@ -254,7 +254,6 @@ static void ep0_reset(struct langwell_ud + } + + dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__); +- return; + } + + +@@ -1502,7 +1501,6 @@ static void langwell_udc_start(struct la + writel(usbcmd, &dev->op_regs->usbcmd); + + dev_dbg(&dev->pdev->dev, "<--- %s()\n", __func__); +- return; + } + + +@@ -1525,7 +1523,6 @@ static void langwell_udc_stop(struct lan + writel(usbcmd, &dev->op_regs->usbcmd); + + dev_dbg(&dev->pdev->dev, "<--- %s()\n", __func__); +- return; + } + + +@@ -2417,7 +2414,6 @@ delegate: + } + end: + dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__); +- return; + } + + +@@ -2633,7 +2629,6 @@ static void handle_trans_complete(struct + } + done: + dev_vdbg(&dev->pdev->dev, "<--- %s()\n", __func__); +- return; + } + + |