Use DEVICE_ATTR RW, RO and WO macros. Update function names
accordingly.
No functional changes intended.
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@xxxxxxxxxxxxxxx>
---
drivers/misc/enclosure.c | 69 +++++++++++++++++-----------------------
1 file changed, 30 insertions(+), 39 deletions(-)
diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c
index 00f50fd0cc85..ab2fd918ecf6 100644
--- a/drivers/misc/enclosure.c
+++ b/drivers/misc/enclosure.c
@@ -473,8 +473,8 @@ static const char *const enclosure_type[] = {
[ENCLOSURE_COMPONENT_ARRAY_DEVICE] = "array device",
};
-static ssize_t get_component_fault(struct device *cdev,
- struct device_attribute *attr, char *buf)
+static ssize_t fault_show(struct device *cdev, struct device_attribute *attr,
+ char *buf)
{
struct enclosure_device *edev = to_enclosure_device(cdev->parent);
struct enclosure_component *ecomp = to_enclosure_component(cdev);
@@ -485,9 +485,8 @@ static ssize_t get_component_fault(struct device *cdev,
return sysfs_emit(buf, "%d\n", status);
}
-static ssize_t set_component_fault(struct device *cdev,
- struct device_attribute *attr,
- const char *buf, size_t count)
+static ssize_t fault_store(struct device *cdev, struct device_attribute *attr,
+ const char *buf, size_t count)
{
struct enclosure_device *edev = to_enclosure_device(cdev->parent);
struct enclosure_component *ecomp = to_enclosure_component(cdev);
@@ -498,8 +497,8 @@ static ssize_t set_component_fault(struct device *cdev,
return count;
}
-static ssize_t get_component_status(struct device *cdev,
- struct device_attribute *attr,char *buf)
+static ssize_t status_show(struct device *cdev, struct device_attribute *attr,
+ char *buf)
{
struct enclosure_device *edev = to_enclosure_device(cdev->parent);
struct enclosure_component *ecomp = to_enclosure_component(cdev);
@@ -510,9 +509,8 @@ static ssize_t get_component_status(struct device *cdev,
return sysfs_emit(buf, "%s\n", enclosure_status[status]);
}
-static ssize_t set_component_status(struct device *cdev,
- struct device_attribute *attr,
- const char *buf, size_t count)
+static ssize_t status_store(struct device *cdev, struct device_attribute *attr,
+ const char *buf, size_t count)
{
struct enclosure_device *edev = to_enclosure_device(cdev->parent);
struct enclosure_component *ecomp = to_enclosure_component(cdev);
@@ -533,9 +531,8 @@ static ssize_t set_component_status(struct device *cdev,
return -EINVAL;
}
-static ssize_t set_component_active(struct device *cdev,
- struct device_attribute *attr,
- const char *buf, size_t count)
+static ssize_t active_store(struct device *cdev, struct device_attribute *attr,
+ const char *buf, size_t count)
{
struct enclosure_device *edev = to_enclosure_device(cdev->parent);
struct enclosure_component *ecomp = to_enclosure_component(cdev);
@@ -546,8 +543,8 @@ static ssize_t set_component_active(struct device *cdev,
return count;
}
-static ssize_t get_component_locate(struct device *cdev,
- struct device_attribute *attr, char *buf)
+static ssize_t locate_show(struct device *cdev, struct device_attribute *attr,
+ char *buf)
{
struct enclosure_device *edev = to_enclosure_device(cdev->parent);
struct enclosure_component *ecomp = to_enclosure_component(cdev);
@@ -558,9 +555,8 @@ static ssize_t get_component_locate(struct device *cdev,
return sysfs_emit(buf, "%d\n", status);
}
-static ssize_t set_component_locate(struct device *cdev,
- struct device_attribute *attr,
- const char *buf, size_t count)
+static ssize_t locate_store(struct device *cdev, struct device_attribute *attr,
+ const char *buf, size_t count)
{
struct enclosure_device *edev = to_enclosure_device(cdev->parent);
struct enclosure_component *ecomp = to_enclosure_component(cdev);
@@ -571,9 +567,8 @@ static ssize_t set_component_locate(struct device *cdev,
return count;
}
-static ssize_t get_component_power_status(struct device *cdev,
- struct device_attribute *attr,
- char *buf)
+static ssize_t power_status_show(struct device *cdev,
+ struct device_attribute *attr, char *buf)
{
struct enclosure_device *edev = to_enclosure_device(cdev->parent);
struct enclosure_component *ecomp = to_enclosure_component(cdev);
@@ -588,9 +583,9 @@ static ssize_t get_component_power_status(struct device *cdev,
return sysfs_emit(buf, "%s\n", ecomp->power_status ? "on" : "off");
}
-static ssize_t set_component_power_status(struct device *cdev,
- struct device_attribute *attr,
- const char *buf, size_t count)
+static ssize_t power_status_store(struct device *cdev,
+ struct device_attribute *attr,
+ const char *buf, size_t count)
{
struct enclosure_device *edev = to_enclosure_device(cdev->parent);
struct enclosure_component *ecomp = to_enclosure_component(cdev);
@@ -610,16 +605,16 @@ static ssize_t set_component_power_status(struct device *cdev,
return count;
}
-static ssize_t get_component_type(struct device *cdev,
- struct device_attribute *attr, char *buf)
+static ssize_t type_show(struct device *cdev,
+ struct device_attribute *attr, char *buf)
{
struct enclosure_component *ecomp = to_enclosure_component(cdev);
return sysfs_emit(buf, "%s\n", enclosure_type[ecomp->type]);
}
-static ssize_t get_component_slot(struct device *cdev,
- struct device_attribute *attr, char *buf)
+static ssize_t slot_show(struct device *cdev,
+ struct device_attribute *attr, char *buf)
{
struct enclosure_component *ecomp = to_enclosure_component(cdev);
int slot;
@@ -633,17 +628,13 @@ static ssize_t get_component_slot(struct device *cdev,
return sysfs_emit(buf, "%d\n", slot);
}
-static DEVICE_ATTR(fault, S_IRUGO | S_IWUSR, get_component_fault,
- set_component_fault);
-static DEVICE_ATTR(status, S_IRUGO | S_IWUSR, get_component_status,
- set_component_status);
-static DEVICE_ATTR(active, S_IWUSR, NULL, set_component_active);
-static DEVICE_ATTR(locate, S_IRUGO | S_IWUSR, get_component_locate,
- set_component_locate);
-static DEVICE_ATTR(power_status, S_IRUGO | S_IWUSR, get_component_power_status,
- set_component_power_status);
-static DEVICE_ATTR(type, S_IRUGO, get_component_type, NULL);
-static DEVICE_ATTR(slot, S_IRUGO, get_component_slot, NULL);
+static DEVICE_ATTR_RW(fault);
+static DEVICE_ATTR_RW(status);
+static DEVICE_ATTR_WO(active);
+static DEVICE_ATTR_RW(locate);
+static DEVICE_ATTR_RW(power_status);
+static DEVICE_ATTR_RO(type);
+static DEVICE_ATTR_RO(slot);
static struct attribute *enclosure_component_attrs[] = {
&dev_attr_fault.attr,
--
2.26.2
