Skip to contentSkip to conversation

HID: usb_buffer_free() cleanup

PATCH New Dmitry Torokhov 1 participant 1 message May 3, 2007

Subsystems (2)
HID USB HID/hidbp drivers (USB keyboards, mice, remote controls, ...)
lore
Share & tools
lore

Dmitry Torokhov

author
#0 lore raw

PATCH 1/1 HID: usb_buffer_free() cleanup

Subject: HID: usb_buffer_free() cleanup
From: Dmitry Torokhov <[email protected]>

HID: usb_buffer_free() cleanup

usb_buffer_free() now handles NULLs so remove unneeded chaecks form callers.

Signed-off-by Dmitry Torokhov <[email protected]>

---

 drivers/hid/usbhid/hid-core.c |   12 ++++--------
 drivers/hid/usbhid/usbkbd.c   |    9 +++------
 2 files changed, 7 insertions(+), 14 deletions(-)
drivers/hid/usbhid/hid-core.c +4 -8
Index: work/drivers/hid/usbhid/hid-core.c
===================================================================
@@ -626,14 +626,10 @@ static void hid_free_buffers(struct usb_
 {
 	struct usbhid_device *usbhid = hid->driver_data;
 
-	if (usbhid->inbuf)
-		usb_buffer_free(dev, usbhid->bufsize, usbhid->inbuf, usbhid->inbuf_dma);
-	if (usbhid->outbuf)
-		usb_buffer_free(dev, usbhid->bufsize, usbhid->outbuf, usbhid->outbuf_dma);
-	if (usbhid->cr)
-		usb_buffer_free(dev, sizeof(*(usbhid->cr)), usbhid->cr, usbhid->cr_dma);
-	if (usbhid->ctrlbuf)
-		usb_buffer_free(dev, usbhid->bufsize, usbhid->ctrlbuf, usbhid->ctrlbuf_dma);
+	usb_buffer_free(dev, usbhid->bufsize, usbhid->inbuf, usbhid->inbuf_dma);
+	usb_buffer_free(dev, usbhid->bufsize, usbhid->outbuf, usbhid->outbuf_dma);
+	usb_buffer_free(dev, sizeof(*(usbhid->cr)), usbhid->cr, usbhid->cr_dma);
+	usb_buffer_free(dev, usbhid->bufsize, usbhid->ctrlbuf, usbhid->ctrlbuf_dma);
 }
 
 /*
drivers/hid/usbhid/usbkbd.c +3 -6
Index: work/drivers/hid/usbhid/usbkbd.c
===================================================================
@@ -211,12 +211,9 @@ static void usb_kbd_free_mem(struct usb_
 {
 	usb_free_urb(kbd->irq);
 	usb_free_urb(kbd->led);
-	if (kbd->new)
-		usb_buffer_free(dev, 8, kbd->new, kbd->new_dma);
-	if (kbd->cr)
-		usb_buffer_free(dev, sizeof(struct usb_ctrlrequest), kbd->cr, kbd->cr_dma);
-	if (kbd->leds)
-		usb_buffer_free(dev, 1, kbd->leds, kbd->leds_dma);
+	usb_buffer_free(dev, 8, kbd->new, kbd->new_dma);
+	usb_buffer_free(dev, sizeof(struct usb_ctrlrequest), kbd->cr, kbd->cr_dma);
+	usb_buffer_free(dev, 1, kbd->leds, kbd->leds_dma);
 }
 
 static int usb_kbd_probe(struct usb_interface *iface,