From: "Jiri Slaby (SUSE)" <jirislaby@kernel.org>
To: bp@alien8.de
Cc: linux-kernel@vger.kernel.org,
"Jiri Slaby (SUSE)" <jirislaby@kernel.org>,
Tony Luck <tony.luck@intel.com>,
James Morse <james.morse@arm.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Robert Richter <rric@kernel.org>,
linux-edac@vger.kernel.org
Subject: [PATCH 3/7] EDAC/device: Remove edac_dev_sysfs_block_attribute::store()
Date: Tue, 13 Feb 2024 12:20:47 +0100 [thread overview]
Message-ID: <20240213112051.27715-4-jirislaby@kernel.org> (raw)
In-Reply-To: <20240213112051.27715-1-jirislaby@kernel.org>
Noone uses this store hook (both BLOCK_ATTR() pass NULL). It actually
never was since its addition in fd309a9d8e63e (drivers/edac: fix leaf
sysfs attribute), so drop it.
Found by https://github.com/jirislaby/clang-struct.
Signed-off-by: Jiri Slaby (SUSE) <jirislaby@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Tony Luck <tony.luck@intel.com>
Cc: James Morse <james.morse@arm.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Robert Richter <rric@kernel.org>
Cc: linux-edac@vger.kernel.org
---
drivers/edac/edac_device.c | 1 -
drivers/edac/edac_device.h | 9 +++------
drivers/edac/edac_device_sysfs.c | 22 +++-------------------
3 files changed, 6 insertions(+), 26 deletions(-)
diff --git a/drivers/edac/edac_device.c b/drivers/edac/edac_device.c
index 0e18729111d4..8c2aa5bcf1b7 100644
--- a/drivers/edac/edac_device.c
+++ b/drivers/edac/edac_device.c
@@ -160,7 +160,6 @@ edac_device_alloc_ctl_info(unsigned pvt_sz, char *dev_name, unsigned nr_instance
*/
attrib->attr = attrib_spec[attr].attr;
attrib->show = attrib_spec[attr].show;
- attrib->store = attrib_spec[attr].store;
edac_dbg(4, "alloc-attrib=%p attrib_name='%s' attrib-spec=%p spec-name=%s\n",
attrib, attrib->attr.name,
diff --git a/drivers/edac/edac_device.h b/drivers/edac/edac_device.h
index c4704b5b1e9f..a39752432c90 100644
--- a/drivers/edac/edac_device.h
+++ b/drivers/edac/edac_device.h
@@ -95,16 +95,13 @@ struct edac_dev_sysfs_attribute {
*
* used in leaf 'block' nodes for adding controls/attributes
*
- * each block in each instance of the containing control structure
- * can have an array of the following. The show and store functions
- * will be filled in with the show/store function in the
- * low level driver.
+ * each block in each instance of the containing control structure can
+ * have an array of the following. The show function will be filled in
+ * with the show function in the low level driver.
*/
struct edac_dev_sysfs_block_attribute {
struct attribute attr;
ssize_t (*show)(struct kobject *, struct attribute *, char *);
- ssize_t (*store)(struct kobject *, struct attribute *,
- const char *, size_t);
};
/* device block control structure */
diff --git a/drivers/edac/edac_device_sysfs.c b/drivers/edac/edac_device_sysfs.c
index 237a542e045a..fcebc4ffea26 100644
--- a/drivers/edac/edac_device_sysfs.c
+++ b/drivers/edac/edac_device_sysfs.c
@@ -457,35 +457,19 @@ static ssize_t edac_dev_block_show(struct kobject *kobj,
return -EIO;
}
-/* Function to 'store' fields into the edac_dev 'block' structure */
-static ssize_t edac_dev_block_store(struct kobject *kobj,
- struct attribute *attr,
- const char *buffer, size_t count)
-{
- struct edac_dev_sysfs_block_attribute *block_attr;
-
- block_attr = to_block_attr(attr);
-
- if (block_attr->store)
- return block_attr->store(kobj, attr, buffer, count);
- return -EIO;
-}
-
/* edac_dev file operations for a 'block' */
static const struct sysfs_ops device_block_ops = {
.show = edac_dev_block_show,
- .store = edac_dev_block_store
};
-#define BLOCK_ATTR(_name,_mode,_show,_store) \
+#define BLOCK_ATTR(_name,_mode,_show) \
static struct edac_dev_sysfs_block_attribute attr_block_##_name = { \
.attr = {.name = __stringify(_name), .mode = _mode }, \
.show = _show, \
- .store = _store, \
};
-BLOCK_ATTR(ce_count, S_IRUGO, block_ce_count_show, NULL);
-BLOCK_ATTR(ue_count, S_IRUGO, block_ue_count_show, NULL);
+BLOCK_ATTR(ce_count, S_IRUGO, block_ce_count_show);
+BLOCK_ATTR(ue_count, S_IRUGO, block_ue_count_show);
/* list of edac_dev 'block' attributes */
static struct attribute *device_block_attrs[] = {
--
2.43.1
next prev parent reply other threads:[~2024-02-13 11:21 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-13 11:20 [PATCH 0/7] EDAC: remove unused structure members Jiri Slaby (SUSE)
2024-02-13 11:20 ` [PATCH 1/7] EDAC/amd64: Remove amd64_pvt::ext_nbcfg Jiri Slaby (SUSE)
2024-02-14 20:23 ` Yazen Ghannam
2024-02-13 11:20 ` [PATCH 2/7] EDAC/device: Remove edac_dev_sysfs_block_attribute::{block,value} Jiri Slaby (SUSE)
2024-02-13 11:20 ` Jiri Slaby (SUSE) [this message]
2024-02-13 11:20 ` [PATCH 4/7] EDAC: Remove dynamic attributes from edac_device_alloc_ctl_info() Jiri Slaby (SUSE)
2024-02-13 11:20 ` [PATCH 5/7] EDAC: Remove edac_pci_ctl_info::edac_subsys Jiri Slaby (SUSE)
2024-02-13 11:20 ` [PATCH 6/7] EDAC: Remove edac_pci_ctl_info::complete Jiri Slaby (SUSE)
2024-02-13 11:20 ` [PATCH 7/7] EDAC: Remove edac_device_ctl_info::removal_complete Jiri Slaby (SUSE)
2024-03-08 9:01 ` [PATCH 0/7] EDAC: remove unused structure members Jiri Slaby
2024-03-08 9:16 ` Borislav Petkov
2024-03-27 17:32 ` Borislav Petkov
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=20240213112051.27715-4-jirislaby@kernel.org \
--to=jirislaby@kernel.org \
--cc=bp@alien8.de \
--cc=james.morse@arm.com \
--cc=linux-edac@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mchehab@kernel.org \
--cc=rric@kernel.org \
--cc=tony.luck@intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.