From: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
To: helgaas@kernel.org
Cc: linux-pci@vger.kernel.org, stuart.w.hayes@gmail.com,
dan.j.williams@intel.com
Subject: [PATCH 2/3] misc: enclosure, ses: simplify some get callbacks
Date: Thu, 17 Nov 2022 17:34:06 +0100 [thread overview]
Message-ID: <20221117163407.28472-3-mariusz.tkaczyk@linux.intel.com> (raw)
In-Reply-To: <20221117163407.28472-1-mariusz.tkaczyk@linux.intel.com>
Remove active, status, fault and locate variables from
enclosure_component struct. Return then directly.
No functional changes intended.
Signed-off-by: Mariusz Tkaczyk <mariusz.tkaczyk@linux.intel.com>
---
drivers/misc/enclosure.c | 15 +++++++++------
drivers/scsi/ses.c | 33 ++++++++++++++++++---------------
include/linux/enclosure.h | 12 ++++--------
3 files changed, 31 insertions(+), 29 deletions(-)
diff --git a/drivers/misc/enclosure.c b/drivers/misc/enclosure.c
index fd0707a8ed79..00f50fd0cc85 100644
--- a/drivers/misc/enclosure.c
+++ b/drivers/misc/enclosure.c
@@ -478,10 +478,11 @@ static ssize_t get_component_fault(struct device *cdev,
{
struct enclosure_device *edev = to_enclosure_device(cdev->parent);
struct enclosure_component *ecomp = to_enclosure_component(cdev);
+ int status = 0;
if (edev->cb->get_fault)
- edev->cb->get_fault(edev, ecomp);
- return sysfs_emit(buf, "%d\n", ecomp->fault);
+ status = edev->cb->get_fault(edev, ecomp);
+ return sysfs_emit(buf, "%d\n", status);
}
static ssize_t set_component_fault(struct device *cdev,
@@ -502,10 +503,11 @@ static ssize_t get_component_status(struct device *cdev,
{
struct enclosure_device *edev = to_enclosure_device(cdev->parent);
struct enclosure_component *ecomp = to_enclosure_component(cdev);
+ enum enclosure_status status = 0;
if (edev->cb->get_status)
- edev->cb->get_status(edev, ecomp);
- return sysfs_emit(buf, "%s\n", enclosure_status[ecomp->status]);
+ status = edev->cb->get_status(edev, ecomp);
+ return sysfs_emit(buf, "%s\n", enclosure_status[status]);
}
static ssize_t set_component_status(struct device *cdev,
@@ -549,10 +551,11 @@ static ssize_t get_component_locate(struct device *cdev,
{
struct enclosure_device *edev = to_enclosure_device(cdev->parent);
struct enclosure_component *ecomp = to_enclosure_component(cdev);
+ int status = 0;
if (edev->cb->get_locate)
- edev->cb->get_locate(edev, ecomp);
- return sysfs_emit(buf, "%d\n", ecomp->locate);
+ status = edev->cb->get_locate(edev, ecomp);
+ return sysfs_emit(buf, "%d\n", status);
}
static ssize_t set_component_locate(struct device *cdev,
diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
index 0a1734f34587..901dc94e5aeb 100644
--- a/drivers/scsi/ses.c
+++ b/drivers/scsi/ses.c
@@ -209,13 +209,14 @@ static void ses_get_fault(struct enclosure_device *edev,
{
unsigned char *desc;
- if (!ses_page2_supported(edev)) {
- ecomp->fault = 0;
- return;
- }
+ if (!ses_page2_supported(edev))
+ return 0;
+
desc = ses_get_page2_descriptor(edev, ecomp);
if (desc)
- ecomp->fault = (desc[3] & 0x60) >> 4;
+ return (desc[3] & 0x60) >> 4;
+
+ return 0;
}
static int ses_set_fault(struct enclosure_device *edev,
@@ -255,13 +256,14 @@ static void ses_get_status(struct enclosure_device *edev,
{
unsigned char *desc;
- if (!ses_page2_supported(edev)) {
- ecomp->status = 0;
- return;
- }
+ if (!ses_page2_supported(edev))
+ return 0;
+
desc = ses_get_page2_descriptor(edev, ecomp);
if (desc)
- ecomp->status = (desc[0] & 0x0f);
+ return (desc[0] & 0x0f);
+
+ return 0;
}
static void ses_get_locate(struct enclosure_device *edev,
@@ -269,13 +271,14 @@ static void ses_get_locate(struct enclosure_device *edev,
{
unsigned char *desc;
- if (!ses_page2_supported(edev)) {
- ecomp->locate = 0;
- return;
- }
+ if (!ses_page2_supported(edev))
+ return 0;
+
desc = ses_get_page2_descriptor(edev, ecomp);
if (desc)
- ecomp->locate = (desc[2] & 0x02) ? 1 : 0;
+ return (desc[2] & 0x02) ? 1 : 0;
+
+ return 0;
}
static int ses_set_locate(struct enclosure_device *edev,
diff --git a/include/linux/enclosure.h b/include/linux/enclosure.h
index 8d09c6d07bf1..b70e9deef3bc 100644
--- a/include/linux/enclosure.h
+++ b/include/linux/enclosure.h
@@ -52,12 +52,12 @@ enum enclosure_component_setting {
struct enclosure_device;
struct enclosure_component;
struct enclosure_component_callbacks {
- void (*get_status)(struct enclosure_device *,
+ int (*get_status)(struct enclosure_device *,
struct enclosure_component *);
int (*set_status)(struct enclosure_device *,
struct enclosure_component *,
enum enclosure_status);
- void (*get_fault)(struct enclosure_device *,
+ int (*get_fault)(struct enclosure_device *,
struct enclosure_component *);
int (*set_fault)(struct enclosure_device *,
struct enclosure_component *,
@@ -65,8 +65,8 @@ struct enclosure_component_callbacks {
int (*set_active)(struct enclosure_device *,
struct enclosure_component *,
enum enclosure_component_setting);
- void (*get_locate)(struct enclosure_device *,
- struct enclosure_component *);
+ int (*get_locate)(struct enclosure_device *,
+ struct enclosure_component *);
int (*set_locate)(struct enclosure_device *,
struct enclosure_component *,
enum enclosure_component_setting);
@@ -85,11 +85,7 @@ struct enclosure_component {
struct device *dev;
enum enclosure_component_type type;
int number;
- int fault;
- int active;
- int locate;
int slot;
- enum enclosure_status status;
int power_status;
};
--
2.26.2
next prev parent reply other threads:[~2022-11-17 16:35 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-17 16:34 [PATCH 0/3] Enclosure sysfs refactor Mariusz Tkaczyk
2022-11-17 16:34 ` [PATCH 1/3] misc: enclosure: remove get_active() callback Mariusz Tkaczyk
2023-05-04 17:22 ` Dan Williams
2022-11-17 16:34 ` Mariusz Tkaczyk [this message]
2023-05-04 23:58 ` [PATCH 2/3] misc: enclosure, ses: simplify some get callbacks Dan Williams
2023-05-05 11:45 ` Mariusz Tkaczyk
2023-05-05 17:33 ` Dan Williams
2022-11-17 16:34 ` [PATCH 3/3] misc: enclosure: update sysfs api Mariusz Tkaczyk
2023-05-05 0:11 ` Dan Williams
2023-05-04 12:10 ` [PATCH 0/3] Enclosure sysfs refactor Mariusz Tkaczyk
2023-05-04 17:16 ` Dan Williams
2023-05-05 9:12 ` Mariusz Tkaczyk
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221117163407.28472-3-mariusz.tkaczyk@linux.intel.com \
--to=mariusz.tkaczyk@linux.intel.com \
--cc=dan.j.williams@intel.com \
--cc=helgaas@kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=stuart.w.hayes@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).