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

Commit 52150c78 authored by Joe Perches's avatar Joe Perches Committed by Jiri Kosina
Browse files

HID: usbhid: Use pr_<level> and remove unnecessary OOM messages 



Use a more common logging style and remove the unnecessary
OOM messages as there is default dump_stack when OOM.

Miscellanea:

o Hoist an assignment in an if
o Realign arguments
o Realign a deeply indented if descendent above a printk

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Reviewed-by: default avatarBenjamin Tissoires <benjamin.tissoires@redhat.com>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 933bfe4d

drivers/hid/usbhid/hid-core.c

+7 −9
Original line number Diff line number Diff line
@@ -1008,10 +1008,9 @@ static int usbhid_parse(struct hid_device *hid) 
		return -EINVAL;

	}



	if (!(rdesc = kmalloc(rsize, GFP_KERNEL))) {

		dbg_hid("couldn't allocate rdesc memory\n");

	rdesc = kmalloc(rsize, GFP_KERNEL);

	if (!rdesc)

		return -ENOMEM;

	}



	hid_set_idle(dev, interface->desc.bInterfaceNumber, 0, 0);
@@ -1081,7 +1080,7 @@ static int usbhid_start(struct hid_device *hid) 
		if (hid->quirks & HID_QUIRK_FULLSPEED_INTERVAL &&

		    dev->speed == USB_SPEED_HIGH) {

			interval = fls(endpoint->bInterval*8);

			printk(KERN_INFO "%s: Fixing fullspeed to highspeed interval: %d -> %d\n",

			pr_info("%s: Fixing fullspeed to highspeed interval: %d -> %d\n",

				hid->name, endpoint->bInterval, interval);

		}
@@ -1468,10 +1467,9 @@ static int hid_post_reset(struct usb_interface *intf) 
	 * the size of the HID report descriptor has not changed.

	 */

	rdesc = kmalloc(hid->dev_rsize, GFP_KERNEL);

	if (!rdesc) {

		dbg_hid("couldn't allocate rdesc memory (post_reset)\n");

	if (!rdesc)

		return -ENOMEM;

	}



	status = hid_get_class_descriptor(dev,

				interface->desc.bInterfaceNumber,

				HID_DT_REPORT, rdesc, hid->dev_rsize);
@@ -1649,7 +1647,7 @@ static int __init hid_init(void) 
	retval = usb_register(&hid_driver);

	if (retval)

		goto usb_register_fail;

	printk(KERN_INFO KBUILD_MODNAME ": " DRIVER_DESC "\n");

	pr_info(KBUILD_MODNAME ": " DRIVER_DESC "\n");



	return 0;

usb_register_fail:

drivers/hid/usbhid/hid-quirks.c

+4 −7
Original line number Diff line number Diff line
@@ -237,10 +237,8 @@ static int usbhid_modify_dquirk(const u16 idVendor, const u16 idProduct, 
	}



	q_new = kmalloc(sizeof(struct quirks_list_struct), GFP_KERNEL);

	if (!q_new) {

		dbg_hid("Could not allocate quirks_list_struct\n");

	if (!q_new)

		return -ENOMEM;

	}



	q_new->hid_bl_item.idVendor = idVendor;

	q_new->hid_bl_item.idProduct = idProduct;
@@ -307,8 +305,7 @@ int usbhid_quirks_init(char **quirks_param) 


		if (m != 3 ||

		    usbhid_modify_dquirk(idVendor, idProduct, quirks) != 0) {

			printk(KERN_WARNING

					"Could not parse HID quirk module param %s\n",

			pr_warn("Could not parse HID quirk module param %s\n",

				quirks_param[n]);

		}

	}