From: Harsh Kumar <harsh1kumar@gmail.com>
To: kernel-janitors@vger.kernel.org
Subject: [Patch] Staging: winbond: usb_free_urb(NULL) is safe
Date: Thu, 30 May 2013 04:47:02 +0000 [thread overview]
Message-ID: <51A6D6F6.1050204@gmail.com> (raw)
usb_free_urb(NULL) is safe. So, the check was removed. Also, couple of checkpatch.pl fixes
Signed-off-by: Harsh Kumar <harsh1kumar@gmail.com>
---
drivers/staging/winbond/phy_calibration.c | 2 +-
drivers/staging/winbond/wb35reg.c | 14 +++++---------
drivers/staging/winbond/wb35rx.c | 3 +--
3 files changed, 7 insertions(+), 12 deletions(-)
diff -uprN a/drivers/staging/winbond/phy_calibration.c b/drivers/staging/winbond/phy_calibration.c
--- a/drivers/staging/winbond/phy_calibration.c 2013-05-28 00:52:15.000000000 +0530
+++ b/drivers/staging/winbond/phy_calibration.c 2013-05-28 01:54:07.000000000 +0530
@@ -296,7 +296,7 @@ void _sin_cos(s32 angle, s32 *sin, s32 *
}
}
-static unsigned char hal_get_dxx_reg(struct hw_data *pHwData, u16 number, u32 * pValue)
+static unsigned char hal_get_dxx_reg(struct hw_data *pHwData, u16 number, u32 *pValue)
{
if (number < 0x1000)
number += 0x1000;
diff -uprN a/drivers/staging/winbond/wb35reg.c b/drivers/staging/winbond/wb35reg.c
--- a/drivers/staging/winbond/wb35reg.c 2013-05-28 00:52:26.000000000 +0530
+++ b/drivers/staging/winbond/wb35reg.c 2013-05-28 02:11:35.000000000 +0530
@@ -64,12 +64,11 @@ unsigned char Wb35Reg_BurstWrite(struct
return true;
} else {
- if (urb)
- usb_free_urb(urb);
+ usb_free_urb(urb);
kfree(reg_queue);
return false;
}
- return false;
+ return false;
}
void Wb35Reg_Update(struct hw_data *pHwData, u16 RegisterNo, u32 RegisterValue)
@@ -206,8 +205,7 @@ unsigned char Wb35Reg_Write(struct hw_da
return true;
} else {
- if (urb)
- usb_free_urb(urb);
+ usb_free_urb(urb);
kfree(reg_queue);
return false;
}
@@ -270,8 +268,7 @@ unsigned char Wb35Reg_WriteWithCallbackV
Wb35Reg_EP0VM_start(pHwData);
return true;
} else {
- if (urb)
- usb_free_urb(urb);
+ usb_free_urb(urb);
kfree(reg_queue);
return false;
}
@@ -374,8 +371,7 @@ unsigned char Wb35Reg_Read(struct hw_dat
return true;
} else {
- if (urb)
- usb_free_urb(urb);
+ usb_free_urb(urb);
kfree(reg_queue);
return false;
}
diff -uprN a/drivers/staging/winbond/wb35rx.c b/drivers/staging/winbond/wb35rx.c
--- a/drivers/staging/winbond/wb35rx.c 2013-05-28 00:52:40.000000000 +0530
+++ b/drivers/staging/winbond/wb35rx.c 2013-05-28 02:25:16.000000000 +0530
@@ -343,8 +343,7 @@ void Wb35Rx_destroy(struct hw_data *pHwD
} while (pWb35Rx->EP3vm_state != VM_STOP);
msleep(10); /* Delay for waiting function exit */
- if (pWb35Rx->RxUrb)
- usb_free_urb(pWb35Rx->RxUrb);
+ usb_free_urb(pWb35Rx->RxUrb);
pr_debug("Wb35Rx_destroy OK\n");
}
next reply other threads:[~2013-05-30 4:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-30 4:47 Harsh Kumar [this message]
2013-05-30 5:11 ` [Patch] Staging: winbond: usb_free_urb(NULL) is safe Julia Lawall
2013-05-30 6:50 ` Harsh Kumar
2013-05-30 7:28 ` Julia Lawall
2013-05-30 7:43 ` Julia Lawall
2013-05-30 7:50 ` Harsh Kumar
2013-05-30 7:55 ` Harsh Kumar
2013-05-30 9:38 ` Pavel Machek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=51A6D6F6.1050204@gmail.com \
--to=harsh1kumar@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox