[PATCH] USB: storage: fix compile warning

2013-12-09 Thread Ming Lei
This patch should fix the below compile warning:

drivers/usb/storage/protocol.c: In function 'usb_stor_access_xfer_buf':
drivers/usb/storage/protocol.c:155:22: warning: comparison of distinct
pointer types lacks a cast [enabled by default]

Reported-by: kbuild test robot fengguang...@intel.com
Reported-by: Stephen Rothwell s...@canb.auug.org.au
---
 drivers/usb/storage/protocol.c |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/usb/storage/protocol.c b/drivers/usb/storage/protocol.c
index f54e5fe..599d88f 100644
--- a/drivers/usb/storage/protocol.c
+++ b/drivers/usb/storage/protocol.c
@@ -152,7 +152,8 @@ unsigned int usb_stor_access_xfer_buf(unsigned char *buffer,
return cnt;
 
while (sg_miter_next(miter)  cnt  buflen) {
-   unsigned int len = min(miter.length, buflen - cnt);
+   unsigned int len = min_t(unsigned, miter.length,
+   buflen - cnt);
 
if (dir == FROM_XFER_BUF)
memcpy(buffer + cnt, miter.addr, len);
-- 
1.7.9.5

--
To unsubscribe from this list: send the line unsubscribe linux-usb in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] USB: storage: fix compile warning

2013-12-09 Thread Greg Kroah-Hartman
On Tue, Dec 10, 2013 at 12:37:24PM +0800, Ming Lei wrote:
 This patch should fix the below compile warning:
 
 drivers/usb/storage/protocol.c: In function 'usb_stor_access_xfer_buf':
 drivers/usb/storage/protocol.c:155:22: warning: comparison of distinct
 pointer types lacks a cast [enabled by default]
 
 Reported-by: kbuild test robot fengguang...@intel.com
 Reported-by: Stephen Rothwell s...@canb.auug.org.au
 ---
  drivers/usb/storage/protocol.c |3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/drivers/usb/storage/protocol.c b/drivers/usb/storage/protocol.c
 index f54e5fe..599d88f 100644
 --- a/drivers/usb/storage/protocol.c
 +++ b/drivers/usb/storage/protocol.c
 @@ -152,7 +152,8 @@ unsigned int usb_stor_access_xfer_buf(unsigned char 
 *buffer,
   return cnt;
  
   while (sg_miter_next(miter)  cnt  buflen) {
 - unsigned int len = min(miter.length, buflen - cnt);
 + unsigned int len = min_t(unsigned, miter.length,

s/unsigned,/unsigned int/

?

--
To unsubscribe from this list: send the line unsubscribe linux-usb in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] USB: storage: fix compile warning

2013-12-09 Thread Ming Lei
On Tue, Dec 10, 2013 at 1:05 PM, Greg Kroah-Hartman
gre...@linuxfoundation.org wrote:
 On Tue, Dec 10, 2013 at 12:37:24PM +0800, Ming Lei wrote:
 This patch should fix the below compile warning:

 drivers/usb/storage/protocol.c: In function 'usb_stor_access_xfer_buf':
 drivers/usb/storage/protocol.c:155:22: warning: comparison of distinct
 pointer types lacks a cast [enabled by default]

 Reported-by: kbuild test robot fengguang...@intel.com
 Reported-by: Stephen Rothwell s...@canb.auug.org.au
 ---
  drivers/usb/storage/protocol.c |3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)

 diff --git a/drivers/usb/storage/protocol.c b/drivers/usb/storage/protocol.c
 index f54e5fe..599d88f 100644
 --- a/drivers/usb/storage/protocol.c
 +++ b/drivers/usb/storage/protocol.c
 @@ -152,7 +152,8 @@ unsigned int usb_stor_access_xfer_buf(unsigned char 
 *buffer,
   return cnt;

   while (sg_miter_next(miter)  cnt  buflen) {
 - unsigned int len = min(miter.length, buflen - cnt);
 + unsigned int len = min_t(unsigned, miter.length,

 s/unsigned,/unsigned int/

Actually, the two are same, and I may change to 'unsigned int' if
you require that, also signed-off-by is missed for the patch.

Thanks,
--
Ming Lei
--
To unsubscribe from this list: send the line unsubscribe linux-usb in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH] USB: storage: fix compile warning

2013-12-09 Thread Greg Kroah-Hartman
On Tue, Dec 10, 2013 at 01:18:48PM +0800, Ming Lei wrote:
 On Tue, Dec 10, 2013 at 1:05 PM, Greg Kroah-Hartman
 gre...@linuxfoundation.org wrote:
  On Tue, Dec 10, 2013 at 12:37:24PM +0800, Ming Lei wrote:
  This patch should fix the below compile warning:
 
  drivers/usb/storage/protocol.c: In function 'usb_stor_access_xfer_buf':
  drivers/usb/storage/protocol.c:155:22: warning: comparison of distinct
  pointer types lacks a cast [enabled by default]
 
  Reported-by: kbuild test robot fengguang...@intel.com
  Reported-by: Stephen Rothwell s...@canb.auug.org.au
  ---
   drivers/usb/storage/protocol.c |3 ++-
   1 file changed, 2 insertions(+), 1 deletion(-)
 
  diff --git a/drivers/usb/storage/protocol.c 
  b/drivers/usb/storage/protocol.c
  index f54e5fe..599d88f 100644
  --- a/drivers/usb/storage/protocol.c
  +++ b/drivers/usb/storage/protocol.c
  @@ -152,7 +152,8 @@ unsigned int usb_stor_access_xfer_buf(unsigned char 
  *buffer,
return cnt;
 
while (sg_miter_next(miter)  cnt  buflen) {
  - unsigned int len = min(miter.length, buflen - cnt);
  + unsigned int len = min_t(unsigned, miter.length,
 
  s/unsigned,/unsigned int/
 
 Actually, the two are same, and I may change to 'unsigned int' if
 you require that, also signed-off-by is missed for the patch.

Ok, care to fix both of these and resend?

thanks,

greg k-h
--
To unsubscribe from this list: send the line unsubscribe linux-usb in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html