usb: move assignment out of if condition
PATCH v2 1/1 usb: move assignment out of if condition
Fix four occurrences of checkpatch.pl error:
ERROR: do not use assignment in if condition
Signed-off-by Kris Borer <[email protected]>
--- drivers/usb/core/hcd.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/usb/core/hcd.c +13 -6
@@ -2683,12 +2683,14 @@ int usb_add_hcd(struct usb_hcd *hcd,* bottom up so that hcds can customize the root hubs before hub_wq * starts talking to them. (Note, bus id is assigned early too.) */ -if ((retval =hcd_buffer_create (hcd)) !=0 ) { + retval =hcd_buffer_create (hcd); +if (retval !=0 ) {dev_dbg (hcd->self.controller,"pool alloc failed\n" ); goto err_create_buf; } -if ((retval =usb_register_bus (&hcd->self)) <0 ) + retval =usb_register_bus (&hcd->self); +if (retval <0 ) goto err_register_bus; rhdev =usb_alloc_dev (NULL , &hcd->self,0 );
@@ -2734,9 +2736,13 @@ int usb_add_hcd(struct usb_hcd *hcd,/* "reset" is misnamed; its role is now one-time init. the controller * should already have been reset (and boot firmware kicked off etc). */ -if (hcd->driver->reset && (retval = hcd->driver->reset (hcd)) <0 ) { -dev_err (hcd->self.controller,"can't setup: %d\n" , retval); - goto err_hcd_driver_setup; +if (hcd->driver->reset) { + retval = hcd->driver->reset (hcd); +if (retval <0 ) { +dev_err (hcd->self.controller,"can't setup: %d\n" , + retval); + goto err_hcd_driver_setup; + } } hcd->rh_pollable =1 ;
@@ -2766,7 +2772,8 @@ int usb_add_hcd(struct usb_hcd *hcd, }/* starting here, usbcore will pay attention to this root hub */ -if ((retval =register_root_hub (hcd)) !=0 ) + retval =register_root_hub (hcd); +if (retval !=0 ) goto err_register_root_hub; retval =sysfs_create_group (&rhdev->dev.kobj, &usb_bus_attr_group);
Signature · 1 line
1.9.1
Greg KH
maintainerQuoted 8 lines · Kris Borer
Fix four occurrences of checkpatch.pl error:
ERROR: do not use assignment in if condition
Signed-off-by Kris Borer <[email protected]>--- drivers/usb/core/hcd.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
Again, please use Coccinelle for something like this, otherwise I'm not going to trust that it is correct :)
thanks,
greg k-h