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

Commit 7b22a885 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

USB: iforce: remove err() usage 



err() was a very old USB-specific macro that I thought had gone away.
This patch removes it from being used in the driver and uses dev_err()
instead.

Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9451df0e

drivers/input/joystick/iforce/iforce-main.c

+2 −1
Original line number Diff line number Diff line
@@ -317,7 +317,8 @@ int iforce_init_device(struct iforce *iforce) 
			break;



	if (i == 20) { /* 5 seconds */

		err("Timeout waiting for response from device.");

		dev_err(&input_dev->dev,

			"Timeout waiting for response from device.\n");

		error = -ENODEV;

		goto fail;

	}

drivers/input/joystick/iforce/iforce-packets.c

+7 −3
Original line number Diff line number Diff line
@@ -257,7 +257,8 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet) 


		status = usb_submit_urb(iforce->ctrl, GFP_ATOMIC);

		if (status) {

			err("usb_submit_urb failed %d", status);

			dev_err(&iforce->usbdev->dev,

				"usb_submit_urb failed %d\n", status);

			return -1;

		}
@@ -289,12 +290,15 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet) 
			return -1;

		}

#else

		err("iforce_get_id_packet: iforce->bus = SERIO!");

		dev_err(&iforce->dev->dev,

			"iforce_get_id_packet: iforce->bus = SERIO!\n");

#endif

		break;



	default:

		err("iforce_get_id_packet: iforce->bus = %d", iforce->bus);

		dev_err(&iforce->dev->dev,

			"iforce_get_id_packet: iforce->bus = %d\n",

			iforce->bus);

		break;

	}

drivers/input/joystick/iforce/iforce-usb.c

+3 −2
Original line number Diff line number Diff line
@@ -100,7 +100,8 @@ static void iforce_usb_irq(struct urb *urb) 
exit:

	status = usb_submit_urb (urb, GFP_ATOMIC);

	if (status)

		err ("%s - usb_submit_urb failed with result %d",

		dev_err(&iforce->usbdev->dev,

			"%s - usb_submit_urb failed with result %d\n",

			__func__, status);

}