[PATCH v2 1/2] usb: gadget: ether: Add \n to each attribute of ethernet functions

[Krzysztof Opasiak]

Generally in SysFS and ConfigFS files are new line terminated.
Also most of USB functions adds a trailing newline to each attribute.
Let's follow this convention also in ethernet functions.

Signed-off-by: Krzysztof Opasiak <k.opas...@samsung.com>
---
 drivers/usb/gadget/function/u_ether.c          | 24 ++++++++++++++++++++----
 drivers/usb/gadget/function/u_ether_configfs.h |  2 +-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/drivers/usb/gadget/function/u_ether.c 
b/drivers/usb/gadget/function/u_ether.c
index 5d1bd13a56c1..8a50d1ccab5d 100644
--- a/drivers/usb/gadget/function/u_ether.c
+++ b/drivers/usb/gadget/function/u_ether.c
@@ -918,9 +918,16 @@ EXPORT_SYMBOL_GPL(gether_set_dev_addr);
 int gether_get_dev_addr(struct net_device *net, char *dev_addr, int len)
 {
        struct eth_dev *dev;
+       int ret;
 
        dev = netdev_priv(net);
-       return get_ether_addr_str(dev->dev_mac, dev_addr, len);
+       ret = get_ether_addr_str(dev->dev_mac, dev_addr, len);
+       if (ret + 1 < len) {
+               dev_addr[ret++] = '\n';
+               dev_addr[ret] = '\0';
+       }
+
+       return ret;
 }
 EXPORT_SYMBOL_GPL(gether_get_dev_addr);
 
@@ -940,9 +947,16 @@ EXPORT_SYMBOL_GPL(gether_set_host_addr);
 int gether_get_host_addr(struct net_device *net, char *host_addr, int len)
 {
        struct eth_dev *dev;
+       int ret;
 
        dev = netdev_priv(net);
-       return get_ether_addr_str(dev->host_mac, host_addr, len);
+       ret = get_ether_addr_str(dev->host_mac, host_addr, len);
+       if (ret + 1 < len) {
+               host_addr[ret++] = '\n';
+               host_addr[ret] = '\0';
+       }
+
+       return ret;
 }
 EXPORT_SYMBOL_GPL(gether_get_host_addr);
 
@@ -989,10 +1003,12 @@ EXPORT_SYMBOL_GPL(gether_get_qmult);
 
 int gether_get_ifname(struct net_device *net, char *name, int len)
 {
+       int ret;
+
        rtnl_lock();
-       strlcpy(name, netdev_name(net), len);
+       ret = snprintf(name, len, "%s\n", netdev_name(net));
        rtnl_unlock();
-       return strlen(name);
+       return ret < len ? ret : len;
 }
 EXPORT_SYMBOL_GPL(gether_get_ifname);
 
diff --git a/drivers/usb/gadget/function/u_ether_configfs.h 
b/drivers/usb/gadget/function/u_ether_configfs.h
index 4f47289fcf7c..c71133de17e7 100644
--- a/drivers/usb/gadget/function/u_ether_configfs.h
+++ b/drivers/usb/gadget/function/u_ether_configfs.h
@@ -108,7 +108,7 @@
                mutex_lock(&opts->lock);                                \
                qmult = gether_get_qmult(opts->net);                    \
                mutex_unlock(&opts->lock);                              \
-               return sprintf(page, "%d", qmult);                      \
+               return sprintf(page, "%d\n", qmult);                    \
        }                                                               \
                                                                        \
        static ssize_t _f_##_opts_qmult_store(struct config_item *item, \
-- 
2.9.3

--
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