diff options
| author | Thierry Reding <treding@nvidia.com> | 2026-04-30 10:16:59 +0200 |
|---|---|---|
| committer | Thierry Reding <treding@nvidia.com> | 2026-04-30 10:16:59 +0200 |
| commit | 16748bd07913a0870a022417411c2951045a517f (patch) | |
| tree | 7a167f6cd0095aa12e4c1fa49eca15691444d1c8 | |
| parent | 64301833dbf6f9854c12becce4bd73dfeca06a84 (diff) | |
| parent | 99a680bed60428175ff9c5c95d579826ca2ff3f8 (diff) | |
| download | linux-next-16748bd07913a0870a022417411c2951045a517f.tar.gz | |
Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git
| -rw-r--r-- | drivers/zorro/zorro-sysfs.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/zorro/zorro-sysfs.c b/drivers/zorro/zorro-sysfs.c index 4e967754d8ad4..9989240fb76b8 100644 --- a/drivers/zorro/zorro-sysfs.c +++ b/drivers/zorro/zorro-sysfs.c @@ -15,6 +15,7 @@ #include <linux/zorro.h> #include <linux/stat.h> #include <linux/string.h> +#include <linux/sysfs.h> #include <asm/byteorder.h> @@ -29,7 +30,7 @@ static ssize_t name##_show(struct device *dev, \ struct zorro_dev *z; \ \ z = to_zorro_dev(dev); \ - return sprintf(buf, format_string, z->field); \ + return sysfs_emit(buf, format_string, z->field); \ } \ static DEVICE_ATTR_RO(name); @@ -44,7 +45,7 @@ static ssize_t serial_show(struct device *dev, struct device_attribute *attr, struct zorro_dev *z; z = to_zorro_dev(dev); - return sprintf(buf, "0x%08x\n", be32_to_cpu(z->rom.er_SerialNumber)); + return sysfs_emit(buf, "0x%08x\n", be32_to_cpu(z->rom.er_SerialNumber)); } static DEVICE_ATTR_RO(serial); @@ -53,10 +54,10 @@ static ssize_t resource_show(struct device *dev, struct device_attribute *attr, { struct zorro_dev *z = to_zorro_dev(dev); - return sprintf(buf, "0x%08lx 0x%08lx 0x%08lx\n", - (unsigned long)zorro_resource_start(z), - (unsigned long)zorro_resource_end(z), - zorro_resource_flags(z)); + return sysfs_emit(buf, "0x%08lx 0x%08lx 0x%08lx\n", + (unsigned long)zorro_resource_start(z), + (unsigned long)zorro_resource_end(z), + zorro_resource_flags(z)); } static DEVICE_ATTR_RO(resource); @@ -65,7 +66,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, { struct zorro_dev *z = to_zorro_dev(dev); - return sprintf(buf, ZORRO_DEVICE_MODALIAS_FMT "\n", z->id); + return sysfs_emit(buf, ZORRO_DEVICE_MODALIAS_FMT "\n", z->id); } static DEVICE_ATTR_RO(modalias); |