[PATCH] usb: Replace a < b ? a : b construct with min_t(type, a, b) in drivers/usb

[dmg]

From: Daniel M German <d...@turingmachine.org>

Use min_t to find the minimum of two values instead of using the ?: operator.

This change does not alter functionality. It is merely cosmetic intended to
improve the readability of the code.

Signed-off-by: Daniel M German <d...@turingmachine.org>
---
 drivers/usb/gadget/function/u_ether.c | 2 +-
 drivers/usb/misc/adutux.c             | 2 +-
 drivers/usb/storage/realtek_cr.c      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/gadget/function/u_ether.c 
b/drivers/usb/gadget/function/u_ether.c
index 737bd77a575d..f6ba46684ddb 100644
--- a/drivers/usb/gadget/function/u_ether.c
+++ b/drivers/usb/gadget/function/u_ether.c
@@ -1006,7 +1006,7 @@ int gether_get_ifname(struct net_device *net, char *name, 
int len)
        rtnl_lock();
        ret = snprintf(name, len, "%s\n", netdev_name(net));
        rtnl_unlock();
-       return ret < len ? ret : len;
+       return min_t(int, ret, len);
 }
 EXPORT_SYMBOL_GPL(gether_get_ifname);
 
diff --git a/drivers/usb/misc/adutux.c b/drivers/usb/misc/adutux.c
index 9465fb95d70a..4a9fa3152f2a 100644
--- a/drivers/usb/misc/adutux.c
+++ b/drivers/usb/misc/adutux.c
@@ -379,7 +379,7 @@ static ssize_t adu_read(struct file *file, __user char 
*buffer, size_t count,
 
                if (data_in_secondary) {
                        /* drain secondary buffer */
-                       int amount = bytes_to_read < data_in_secondary ? 
bytes_to_read : data_in_secondary;
+                       int amount = min_t(size_t, bytes_to_read, 
data_in_secondary);
                        i = copy_to_user(buffer, 
dev->read_buffer_secondary+dev->secondary_head, amount);
                        if (i) {
                                retval = -EFAULT;
diff --git a/drivers/usb/storage/realtek_cr.c b/drivers/usb/storage/realtek_cr.c
index cc794e25a0b6..15ce54bde600 100644
--- a/drivers/usb/storage/realtek_cr.c
+++ b/drivers/usb/storage/realtek_cr.c
@@ -260,7 +260,7 @@ static int rts51x_bulk_transport(struct us_data *us, u8 lun,
         * was really transferred and what the device tells us
         */
        if (residue)
-               residue = residue < buf_len ? residue : buf_len;
+               residue = min_t(unsigned int, residue, buf_len);
 
        if (act_len)
                *act_len = buf_len - residue;
-- 
2.20.1