Enclosure interface cleanups
v3 cover Enclosure interface cleanups
Hi Arnd,
While looking into adding Native PCIE Enclosure Management (NPEM) support behind the existing enclosure ABI, I noticed a few opportunities for cleanups.
Changes since v1[1] + internal review:
- Keep reporting the cached version of ecomp->active (Dan).
- Preserve cached values in ecomp, drop patch 2 (Dan).
- Add comment documenting cached ecomp->active (Dan).
- Move ATTRS macros close to appropriate _show and _store functions (Andy).
- Make comment shorter (Christoph).
- Update patch2 title (Christoph).
[1] https://lore.kernel.org/linux-pci/[email protected]/
[2] https://lore.kernel.org/linux-kernel/[email protected]/
Mariusz Tkaczyk (2):
misc: enclosure: remove get_active callback
misc: enclosure: update sysfs api
drivers/misc/enclosure.c | 84 ++++++++++++++++++--------------------- include/linux/enclosure.h | 2 - 2 files changed, 39 insertions(+), 47 deletions(-)
Signature · 1 line
2.26.2
PATCH v3 1/2 misc: enclosure: remove get_active callback
The callback is not used, remove it. Leave possibility to read cached ecomp->active value.
--- drivers/misc/enclosure.c | 4 +--- include/linux/enclosure.h | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-)
drivers/misc/enclosure.c +1 -3
@@ -534,11 +534,9 @@ static ssize_t set_component_status(struct device *cdev,static ssize_t get_component_active (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); -if (edev->cb->get_active) - edev->cb->get_active (edev, ecomp); +/* The value may have been updated by edev->cb->set_active(). */ return sysfs_emit (buf,"%d\n" , ecomp->active); }
include/linux/enclosure.h +0 -2
@@ -62,8 +62,6 @@ struct enclosure_component_callbacks {int (*set_fault)(struct enclosure_device *,struct enclosure_component *,enum enclosure_component_setting ); -void (*get_active)(struct enclosure_device *, -struct enclosure_component *);int (*set_active)(struct enclosure_device *,struct enclosure_component *,enum enclosure_component_setting );
Signature · 1 line
2.26.2
PATCH v3 2/2 misc: enclosure: use DEVICE_ATTR_RW* macros
In reply to Mariusz TkaczykUse DEVICE_ATTR RW and RO macros. Update function names accordingly. No functional changes intended.
--- drivers/misc/enclosure.c | 80 +++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 42 deletions(-)
drivers/misc/enclosure.c +38 -42
@@ -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);
@@ -484,9 +484,8 @@ static ssize_t get_component_fault(struct device *cdev,return sysfs_emit (buf,"%d\n" , ecomp->fault); } -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);
@@ -497,8 +496,10 @@ 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 DEVICE_ATTR_RW (fault); + +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);
@@ -508,9 +509,8 @@ static ssize_t get_component_status(struct device *cdev,return sysfs_emit (buf,"%s\n" , enclosure_status[ecomp->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);
@@ -531,8 +531,10 @@ static ssize_t set_component_status(struct device *cdev,return -EINVAL ; } -static ssize_t get_component_active (struct device *cdev, -struct device_attribute *attr,char *buf) +static DEVICE_ATTR_RW (status); + +static ssize_t active_show (struct device *cdev,struct device_attribute *attr, +char *buf) {struct enclosure_component *ecomp =to_enclosure_component (cdev);
@@ -540,9 +542,8 @@ static ssize_t get_component_active(struct device *cdev,return sysfs_emit (buf,"%d\n" , ecomp->active); } -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);
@@ -553,8 +554,10 @@ 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 DEVICE_ATTR_RW (active); + +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);
@@ -564,9 +567,8 @@ static ssize_t get_component_locate(struct device *cdev,return sysfs_emit (buf,"%d\n" , ecomp->locate); } -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);
@@ -577,9 +579,10 @@ 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 DEVICE_ATTR_RW (locate); + +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);
@@ -594,9 +597,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);
@@ -616,16 +619,20 @@ 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 DEVICE_ATTR_RW (power_status); + +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 DEVICE_ATTR_RO (type); + +static ssize_t slot_show (struct device *cdev,struct device_attribute *attr, +char *buf) {struct enclosure_component *ecomp =to_enclosure_component (cdev);int slot;
@@ -639,18 +646,7 @@ 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_IRUGO | S_IWUSR, get_component_active, - 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_RO (slot);static struct attribute *enclosure_component_attrs[] = { &dev_attr_fault.attr,
Signature · 1 line
2.26.2
Re: [PATCH v3 1/2] misc: enclosure: remove get_active callback
In reply to Mariusz TkaczykLooks good:
Re: [PATCH v3 1/2] misc: enclosure: remove get_active callback
Quoted 3 lines · On Tue, 30 May 2023 16:36:11 +0200 Christoph Hellwig <[email protected]> wrote:
Looks good:
Reviewed-by Christoph Hellwig <[email protected]>
Hi Arnd,
Gentle reminder. Could you please take a look?
When I can expect it to be merged?
I'm working on the NPEM extension to enclosure services which is based on those changes.
Thanks,
Mariusz