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

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

USB: appletouch.c: 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: Alessandro Rubini <rubini@ipvvis.unipv.it>
CC: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 08813d35

drivers/input/mouse/appletouch.c

+14 −11
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ static int atp_geyser_init(struct usb_device *udev) 


	data = kmalloc(8, GFP_KERNEL);

	if (!data) {

		err("Out of memory");

		dev_err(&udev->dev, "Out of memory\n");

		return -ENOMEM;

	}
@@ -277,7 +277,7 @@ static int atp_geyser_init(struct usb_device *udev) 
		for (i = 0; i < 8; i++)

			dprintk("appletouch[%d]: %d\n", i, data[i]);



		err("Failed to read mode from device.");

		dev_err(&udev->dev, "Failed to read mode from device.\n");

		ret = -EIO;

		goto out_free;

	}
@@ -296,7 +296,7 @@ static int atp_geyser_init(struct usb_device *udev) 
		for (i = 0; i < 8; i++)

			dprintk("appletouch[%d]: %d\n", i, data[i]);



		err("Failed to request geyser raw mode");

		dev_err(&udev->dev, "Failed to request geyser raw mode\n");

		ret = -EIO;

		goto out_free;

	}
@@ -321,7 +321,8 @@ static void atp_reinit(struct work_struct *work) 


	retval = usb_submit_urb(dev->urb, GFP_ATOMIC);

	if (retval)

		err("atp_reinit: usb_submit_urb failed with error %d",

		dev_err(&udev->dev,

			"atp_reinit: usb_submit_urb failed with error %d\n",

			retval);

}
@@ -588,7 +589,8 @@ static void atp_complete_geyser_1_2(struct urb *urb) 
 exit:

	retval = usb_submit_urb(dev->urb, GFP_ATOMIC);

	if (retval)

		err("atp_complete: usb_submit_urb failed with result %d",

		dev_err(&dev->udev->dev,

			"atp_complete: usb_submit_urb failed with result %d\n",

			retval);

}
@@ -722,7 +724,8 @@ static void atp_complete_geyser_3_4(struct urb *urb) 
 exit:

	retval = usb_submit_urb(dev->urb, GFP_ATOMIC);

	if (retval)

		err("atp_complete: usb_submit_urb failed with result %d",

		dev_err(&dev->udev->dev,

			"atp_complete: usb_submit_urb failed with result %d\n",

			retval);

}
@@ -785,7 +788,7 @@ static int atp_probe(struct usb_interface *iface, 
		}

	}

	if (!int_in_endpointAddr) {

		err("Could not find int-in endpoint");

		dev_err(&iface->dev, "Could not find int-in endpoint\n");

		return -EIO;

	}
@@ -793,7 +796,7 @@ static int atp_probe(struct usb_interface *iface, 
	dev = kzalloc(sizeof(struct atp), GFP_KERNEL);

	input_dev = input_allocate_device();

	if (!dev || !input_dev) {

		err("Out of memory");

		dev_err(&iface->dev, "Out of memory\n");

		goto err_free_devs;

	}