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

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

USB: input: iforce: fix up dev_* messages 



Previously I had made the struct device point to the input device, but
after talking with Dmitry, he said that the USB device would make more
sense for this driver to point to.  So converted it to use that instead.

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

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

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


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

		if (status) {

			dev_err(&iforce->dev->dev,

			dev_err(&iforce->intf->dev,

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

			return -1;

		}
@@ -266,7 +266,7 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet) 
			iforce->ctrl->status != -EINPROGRESS, HZ);



		if (iforce->ctrl->status) {

			dev_dbg(&iforce->dev->dev,

			dev_dbg(&iforce->intf->dev,

				"iforce->ctrl->status = %d\n",

				iforce->ctrl->status);

			usb_unlink_urb(iforce->ctrl);

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

+4 −3
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ void iforce_usb_xmit(struct iforce *iforce) 


	if ( (n=usb_submit_urb(iforce->out, GFP_ATOMIC)) ) {

		clear_bit(IFORCE_XMIT_RUNNING, iforce->xmit_flags);

		dev_warn(&iforce->dev->dev, "usb_submit_urb failed %d\n", n);

		dev_warn(&iforce->intf->dev, "usb_submit_urb failed %d\n", n);

	}



	/* The IFORCE_XMIT_RUNNING bit is not cleared here. That's intended.
@@ -76,7 +76,7 @@ void iforce_usb_xmit(struct iforce *iforce) 
static void iforce_usb_irq(struct urb *urb)

{

	struct iforce *iforce = urb->context;

	struct device *dev = &iforce->dev->dev;

	struct device *dev = &iforce->intf->dev;

	int status;



	switch (urb->status) {
@@ -112,7 +112,7 @@ static void iforce_usb_out(struct urb *urb) 


	if (urb->status) {

		clear_bit(IFORCE_XMIT_RUNNING, iforce->xmit_flags);

		dev_dbg(&iforce->dev->dev, "urb->status %d, exiting\n",

		dev_dbg(&iforce->intf->dev, "urb->status %d, exiting\n",

			urb->status);

		return;

	}
@@ -158,6 +158,7 @@ static int iforce_usb_probe(struct usb_interface *intf, 


	iforce->bus = IFORCE_USB;

	iforce->usbdev = dev;

	iforce->intf = intf;



	iforce->cr.bRequestType = USB_TYPE_VENDOR | USB_DIR_IN | USB_RECIP_INTERFACE;

	iforce->cr.wIndex = 0;

drivers/input/joystick/iforce/iforce.h

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ struct iforce { 
#endif

#ifdef CONFIG_JOYSTICK_IFORCE_USB

	struct usb_device *usbdev;	/* USB transfer */

	struct usb_interface *intf;

	struct urb *irq, *out, *ctrl;

	struct usb_ctrlrequest cr;

#endif