Message ID | 20230621134921.904217-2-wintera@linux.ibm.com (mailing list archive) |
---|---|
State | Accepted |
Commit | d3f0c7fa09932d34bbf5548a156316927a099f25 |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | s390/net: updates 2023-06-10 | expand |
On Wed, 2023-06-21 at 15:49 +0200, Alexandra Winter wrote: > From: Thorsten Winkler <twinkler@linux.ibm.com> > > Following the advice of the Documentation/filesystems/sysfs.rst. > All sysfs related show()-functions should only use sysfs_emit() or > sysfs_emit_at() when formatting the value to be returned to user space. > > While at it, follow Linux kernel coding style and unify indentation [] > diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c [] > @@ -1901,14 +1901,14 @@ lcs_open_device(struct net_device *dev) > static ssize_t > lcs_portno_show (struct device *dev, struct device_attribute *attr, char *buf) > { > - struct lcs_card *card; > + struct lcs_card *card; > > card = dev_get_drvdata(dev); > > - if (!card) > - return 0; > + if (!card) > + return 0; > > - return sprintf(buf, "%d\n", card->portno); > + return sysfs_emit(buf, "%d\n", card->portno); [] > @@ -1970,7 +1971,7 @@ lcs_timeout_show(struct device *dev, struct device_attribute *attr, char *buf) > > card = dev_get_drvdata(dev); > > - return card ? sprintf(buf, "%u\n", card->lancmd_timeout) : 0; > + return card ? sysfs_emit(buf, "%u\n", card->lancmd_timeout) : 0; Like the other show function I think it'd be nicer to use: card = dev_get_drvdata(dev); if (!card) return 0; return sysfs_emit(buf, "%u\n", card->lancmd_timeout);
diff --git a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c index 84c8981317b4..bd3d788e5f2d 100644 --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c @@ -1901,14 +1901,14 @@ lcs_open_device(struct net_device *dev) static ssize_t lcs_portno_show (struct device *dev, struct device_attribute *attr, char *buf) { - struct lcs_card *card; + struct lcs_card *card; card = dev_get_drvdata(dev); - if (!card) - return 0; + if (!card) + return 0; - return sprintf(buf, "%d\n", card->portno); + return sysfs_emit(buf, "%d\n", card->portno); } /* @@ -1958,7 +1958,8 @@ lcs_type_show(struct device *dev, struct device_attribute *attr, char *buf) if (!cgdev) return -ENODEV; - return sprintf(buf, "%s\n", lcs_type[cgdev->cdev[0]->id.driver_info]); + return sysfs_emit(buf, "%s\n", + lcs_type[cgdev->cdev[0]->id.driver_info]); } static DEVICE_ATTR(type, 0444, lcs_type_show, NULL); @@ -1970,7 +1971,7 @@ lcs_timeout_show(struct device *dev, struct device_attribute *attr, char *buf) card = dev_get_drvdata(dev); - return card ? sprintf(buf, "%u\n", card->lancmd_timeout) : 0; + return card ? sysfs_emit(buf, "%u\n", card->lancmd_timeout) : 0; } static ssize_t