Skip to contentSkip to conversation

watchdog: pcwd_usb: remove needless check before usb_free_coherent()

PATCH In review Xu Wang 2 participants 2 messages Jul 13, 2020 – Jul 19, 2020 Watchdog device drivers

lore
Share & tools
lore

Xu Wang

author
#0 lore raw

PATCH 1/1 watchdog: pcwd_usb: remove needless check before usb_free_coherent()

usb_free_coherent() is safe with NULL usb_pcwd->intr_buffer and this check is not required.

---
 drivers/watchdog/pcwd_usb.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/watchdog/pcwd_usb.c +2 -3
index 2f44af1831d0..6726301ac02e 100644
@@ -585,9 +585,8 @@ static struct notifier_block usb_pcwd_notifier = {
 static inline void usb_pcwd_delete(struct usb_pcwd_private *usb_pcwd)
 {
 	usb_free_urb(usb_pcwd->intr_urb);
-	if (usb_pcwd->intr_buffer != NULL)
-		usb_free_coherent(usb_pcwd->udev, usb_pcwd->intr_size,
-				  usb_pcwd->intr_buffer, usb_pcwd->intr_dma);
+	usb_free_coherent(usb_pcwd->udev, usb_pcwd->intr_size,
+			  usb_pcwd->intr_buffer, usb_pcwd->intr_dma);
 	kfree(usb_pcwd);
 }
 
Signature · 1 line
2.17.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 4 lines · Xu Wang

usb_free_coherent() is safe with NULL usb_pcwd->intr_buffer and this check is not required.

Quoted 20 lines
---
 drivers/watchdog/pcwd_usb.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/watchdog/pcwd_usb.c +2 -3
index 2f44af1831d0..6726301ac02e 100644
@@ -585,9 +585,8 @@ static struct notifier_block usb_pcwd_notifier = {
 static inline void usb_pcwd_delete(struct usb_pcwd_private *usb_pcwd)
 {
 	usb_free_urb(usb_pcwd->intr_urb);
-	if (usb_pcwd->intr_buffer != NULL)
-		usb_free_coherent(usb_pcwd->udev, usb_pcwd->intr_size,
-				  usb_pcwd->intr_buffer, usb_pcwd->intr_dma);
+	usb_free_coherent(usb_pcwd->udev, usb_pcwd->intr_size,
+			  usb_pcwd->intr_buffer, usb_pcwd->intr_dma);
 	kfree(usb_pcwd);
 }