linux-kernel - [PATCH 5/8] rtc: ds1685: use DEVICE_ATTR

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20210602073820.11011-6-thunder.leizhen@huawei.com>
Date:   Wed, 2 Jun 2021 15:38:17 +0800
From:   Zhen Lei <thunder.leizhen@...wei.com>
To:     Alessandro Zummo <a.zummo@...ertech.it>,
        Alexandre Belloni <alexandre.belloni@...tlin.com>,
        Joshua Kinard <kumba@...too.org>,
        "Linus Walleij" <linus.walleij@...aro.org>,
        linux-arm-kernel <linux-arm-kernel@...ts.infradead.org>,
        linux-rtc <linux-rtc@...r.kernel.org>,
        linux-kernel <linux-kernel@...r.kernel.org>
CC:     Zhen Lei <thunder.leizhen@...wei.com>
Subject: [PATCH 5/8] rtc: ds1685: use DEVICE_ATTR_RO macro

Use DEVICE_ATTR_RO macro helper instead of plain DEVICE_ATTR, which makes
the code a bit shorter and easier to read.

Signed-off-by: Zhen Lei <thunder.leizhen@...wei.com>
---
 drivers/rtc/rtc-ds1685.c | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/drivers/rtc/rtc-ds1685.c b/drivers/rtc/rtc-ds1685.c
index 75db7ab654a5ae1..60209320c7ac9ca 100644
--- a/drivers/rtc/rtc-ds1685.c
+++ b/drivers/rtc/rtc-ds1685.c
@@ -975,14 +975,13 @@ static int ds1685_nvram_write(void *priv, unsigned int pos, void *val,
 /* SysFS interface */
 
 /**
- * ds1685_rtc_sysfs_battery_show - sysfs file for main battery status.
+ * battery_show - sysfs file for main battery status.
  * @dev: pointer to device structure.
  * @attr: pointer to device_attribute structure.
  * @buf: pointer to char array to hold the output.
  */
-static ssize_t
-ds1685_rtc_sysfs_battery_show(struct device *dev,
-			      struct device_attribute *attr, char *buf)
+static ssize_t battery_show(struct device *dev,
+			    struct device_attribute *attr, char *buf)
 {
 	struct ds1685_priv *rtc = dev_get_drvdata(dev->parent);
 	u8 ctrld;
@@ -992,17 +991,16 @@ ds1685_rtc_sysfs_battery_show(struct device *dev,
 	return sprintf(buf, "%s\n",
 			(ctrld & RTC_CTRL_D_VRT) ? "ok" : "not ok or N/A");
 }
-static DEVICE_ATTR(battery, S_IRUGO, ds1685_rtc_sysfs_battery_show, NULL);
+static DEVICE_ATTR_RO(battery);
 
 /**
- * ds1685_rtc_sysfs_auxbatt_show - sysfs file for aux battery status.
+ * auxbatt_show - sysfs file for aux battery status.
  * @dev: pointer to device structure.
  * @attr: pointer to device_attribute structure.
  * @buf: pointer to char array to hold the output.
  */
-static ssize_t
-ds1685_rtc_sysfs_auxbatt_show(struct device *dev,
-			      struct device_attribute *attr, char *buf)
+static ssize_t auxbatt_show(struct device *dev,
+			    struct device_attribute *attr, char *buf)
 {
 	struct ds1685_priv *rtc = dev_get_drvdata(dev->parent);
 	u8 ctrl4a;
@@ -1014,17 +1012,16 @@ ds1685_rtc_sysfs_auxbatt_show(struct device *dev,
 	return sprintf(buf, "%s\n",
 			(ctrl4a & RTC_CTRL_4A_VRT2) ? "ok" : "not ok or N/A");
 }
-static DEVICE_ATTR(auxbatt, S_IRUGO, ds1685_rtc_sysfs_auxbatt_show, NULL);
+static DEVICE_ATTR_RO(auxbatt);
 
 /**
- * ds1685_rtc_sysfs_serial_show - sysfs file for silicon serial number.
+ * serial_show - sysfs file for silicon serial number.
  * @dev: pointer to device structure.
  * @attr: pointer to device_attribute structure.
  * @buf: pointer to char array to hold the output.
  */
-static ssize_t
-ds1685_rtc_sysfs_serial_show(struct device *dev,
-			     struct device_attribute *attr, char *buf)
+static ssize_t serial_show(struct device *dev,
+			   struct device_attribute *attr, char *buf)
 {
 	struct ds1685_priv *rtc = dev_get_drvdata(dev->parent);
 	u8 ssn[8];
@@ -1035,7 +1032,7 @@ ds1685_rtc_sysfs_serial_show(struct device *dev,
 
 	return sprintf(buf, "%8phC\n", ssn);
 }
-static DEVICE_ATTR(serial, S_IRUGO, ds1685_rtc_sysfs_serial_show, NULL);
+static DEVICE_ATTR_RO(serial);
 
 /*
  * struct ds1685_rtc_sysfs_misc_attrs - list for misc RTC features.
-- 
2.26.0.106.g9fadedd