Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0faaad46 authored by Kris Borer's avatar Kris Borer Committed by Greg Kroah-Hartman
Browse files

usb: move assignment out of if condition 



Fix four occurrences of checkpatch.pl error:

ERROR: do not use assignment in if condition

The semantic patch that makes this change is:

// <smpl>
@@
identifier i;
expression E;
statement S;
constant c;
binary operator b;
@@

+ i = E;
  if (
- (i = E)
+ i
  b
  c ) S

@@
identifier i, i2;
expression E1, E2;
constant c;
@@

+ if( E1->i ) {
+  	i2 = E2;
+ 	if (i2 < c) {
- if( E1->i && (i2 = E2) < c ) {
  ...
- }
+ 	}
+ }
// </smpl>

Signed-off-by: default avatarKris Borer <kborer@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent c2a298d9

drivers/usb/core/hcd.c

+13 −6
Original line number Original line Diff line number Diff line
@@ -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

	 * bottom up so that hcds can customize the root hubs before hub_wq

	 * starts talking to them.  (Note, bus id is assigned early too.)

	 * 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");

		dev_dbg(hcd->self.controller, "pool alloc failed\n");

		goto err_create_buf;

		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;

		goto err_register_bus;





	rhdev = usb_alloc_dev(NULL, &hcd->self, 0);

	rhdev = usb_alloc_dev(NULL, &hcd->self, 0);
@@ -2734,10 +2736,14 @@ int usb_add_hcd(struct usb_hcd *hcd, 
	/* "reset" is misnamed; its role is now one-time init. the controller

	/* "reset" is misnamed; its role is now one-time init. the controller

	 * should already have been reset (and boot firmware kicked off etc).

	 * should already have been reset (and boot firmware kicked off etc).

	 */

	 */

	if (hcd->driver->reset && (retval = hcd->driver->reset(hcd)) < 0) {

	if (hcd->driver->reset) {

		dev_err(hcd->self.controller, "can't setup: %d\n", retval);

		retval = hcd->driver->reset(hcd);

		if (retval < 0) {

			dev_err(hcd->self.controller, "can't setup: %d\n",

					retval);

			goto err_hcd_driver_setup;

			goto err_hcd_driver_setup;

		}

		}

	}

	hcd->rh_pollable = 1;

	hcd->rh_pollable = 1;





	/* NOTE: root hub and controller capabilities may not be the same */

	/* NOTE: root hub and controller capabilities may not be the same */
@@ -2766,7 +2772,8 @@ int usb_add_hcd(struct usb_hcd *hcd, 
	}

	}





	/* starting here, usbcore will pay attention to this root hub */

	/* 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;

		goto err_register_root_hub;





	retval = sysfs_create_group(&rhdev->dev.kobj, &usb_bus_attr_group);

	retval = sysfs_create_group(&rhdev->dev.kobj, &usb_bus_attr_group);