Skip to contentSkip to conversation

EDAC: constantify the struct bus_type usage

PATCH In review Greg Kroah-Hartman 2 participants 4 messages Dec 19, 2023 – Dec 29, 2023 EDAC-core

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 EDAC: constantify the struct bus_type usage

In many places in the edac code, struct bus_type pointers are passed around and then eventually sent to the driver core, which can handle a constant pointer. So constantify all of the edac usage of these as well because the data in them is never modified by the edac code either.

Cc Borislav Petkov <[email protected]>
Cc Tony Luck <[email protected]>
Cc James Morse <[email protected]>
Cc Mauro Carvalho Chehab <[email protected]>
Cc Robert Richter <[email protected]>
---
 drivers/edac/edac_device.h       | 2 +-
 drivers/edac/edac_device_sysfs.c | 2 +-
 drivers/edac/edac_module.c       | 4 ++--
 drivers/edac/edac_pci_sysfs.c    | 2 +-
 include/linux/edac.h             | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)
drivers/edac/edac_device.h +1 -1
index 3f44e6b9d387..7db22a4c83ef 100644
@@ -176,7 +176,7 @@ struct edac_device_ctl_info {
 	struct edac_dev_sysfs_attribute *sysfs_attributes;
 
 	/* pointer to main 'edac' subsys in sysfs */
-	struct bus_type *edac_subsys;
+	const struct bus_type *edac_subsys;
 
 	/* the internal state of this controller instance */
 	int op_state;
drivers/edac/edac_device_sysfs.c +1 -1
index 010c26be5846..237a542e045a 100644
@@ -229,7 +229,7 @@ static struct kobj_type ktype_device_ctrl = {
 int edac_device_register_sysfs_main_kobj(struct edac_device_ctl_info *edac_dev)
 {
 	struct device *dev_root;
-	struct bus_type *edac_subsys;
+	const struct bus_type *edac_subsys;
 	int err = -ENODEV;
 
 	edac_dbg(1, "\n");
drivers/edac/edac_module.c +2 -2
index 32a931d0cb71..1c9f62382666 100644
@@ -67,7 +67,7 @@ char *edac_op_state_to_string(int opstate)
  * sysfs object: /sys/devices/system/edac
  *	need to export to other files
  */
-static struct bus_type edac_subsys = {
+static const struct bus_type edac_subsys = {
 	.name = "edac",
 	.dev_name = "edac",
 };
@@ -90,7 +90,7 @@ static void edac_subsys_exit(void)
 }
 
 /* return pointer to the 'edac' node in sysfs */
-struct bus_type *edac_get_sysfs_subsys(void)
+const struct bus_type *edac_get_sysfs_subsys(void)
 {
 	return &edac_subsys;
 }
drivers/edac/edac_pci_sysfs.c +1 -1
index 287cc51dbc86..e823e4da086a 100644
@@ -338,7 +338,7 @@ static struct kobj_type ktype_edac_pci_main_kobj = {
 static int edac_pci_main_kobj_setup(void)
 {
 	int err = -ENODEV;
-	struct bus_type *edac_subsys;
+	const struct bus_type *edac_subsys;
 	struct device *dev_root;
 
 	edac_dbg(0, "\n");
include/linux/edac.h +2 -2
index fa4bda2a70f6..ccaf2ae0801d 100644
@@ -30,7 +30,7 @@ struct device;
 
 extern int edac_op_state;
 
-struct bus_type *edac_get_sysfs_subsys(void);
+const struct bus_type *edac_get_sysfs_subsys(void);
 
 static inline void opstate_init(void)
 {
@@ -492,7 +492,7 @@ struct edac_raw_error_desc {
  */
 struct mem_ctl_info {
 	struct device			dev;
-	struct bus_type			*bus;
+	const struct bus_type		*bus;
 
 	struct list_head link;	/* for global list of mem_ctl_info structs */
 
Signature · 1 line
2.43.0
maintainer
#1 lore raw
Quoted 4 lines · Greg Kroah-Hartman

In many places in the edac code, struct bus_type pointers are passed around and then eventually sent to the driver core, which can handle a constant pointer. So constantify all of the edac usage of these as well because the data in them is never modified by the edac code either.

"constantify", huh? Not enough words in the English language so let's do new ones?

:-)

So what's the plan with this "constantification"?

Because:

drivers/edac/edac_module.c: In function ‘edac_subsys_init’:
drivers/edac/edac_module.c:80:38: warning: passing argument 1 of ‘subsys_system_register’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]

   80 |         err = subsys_system_register(&edac_subsys, NULL);
      |                                      ^~~~~~~~~~~~

In file included from ./include/linux/edac.h:16,
from drivers/edac/edac_module.c:13:
./include/linux/device.h:75:45: note: expected ‘struct bus_type *’ but argument is of type ‘const struct bus_type *’
75 | int subsys_system_register(struct bus_type *subsys,

      |
Signature · 4 lines
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette
#2 lore raw
Quoted 10 lines · Borislav Petkov
Quoted 4 lines · Greg Kroah-Hartman

In many places in the edac code, struct bus_type pointers are passed around and then eventually sent to the driver core, which can handle a constant pointer. So constantify all of the edac usage of these as well because the data in them is never modified by the edac code either.

"constantify", huh? Not enough words in the English language so let's do new ones?

:-)

Hey, we could be using German and then it would be something like "Konstantifizierung" :)

Quoted 6 lines

So what's the plan with this "constantification"?

Because:

drivers/edac/edac_module.c: In function ‘edac_subsys_init’:
drivers/edac/edac_module.c:80:38: warning: passing argument 1 of ‘subsys_system_register’ discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]

Quoted 7 lines
   80 |         err = subsys_system_register(&edac_subsys, NULL);
      |                                      ^~~~~~~~~~~~

In file included from ./include/linux/edac.h:16,
from drivers/edac/edac_module.c:13:
./include/linux/device.h:75:45: note: expected ‘struct bus_type *’ but argument is of type ‘const struct bus_type *’
75 | int subsys_system_register(struct bus_type *subsys,

      |

Ah, oops, that means this depends on a patch in my trees already that fix this up. You can wait until after 6.8-rc1 to get to this, or I can take it in my tree if you want now, which ever is easiest for you.

thanks,

greg k-h

maintainer
#3 lore raw
Quoted 2 lines · Greg Kroah-Hartman

Hey, we could be using German and then it would be something like "Konstantifizierung" :)

Ewww. Or to say in German: "Oh nee". :-P

Lemme guess, that must sound similar in Dutch. google translate says "constantificatie". Fun.

Quoted 3 lines

Ah, oops, that means this depends on a patch in my trees already that fix this up. You can wait until after 6.8-rc1 to get to this, or I can take it in my tree if you want now, which ever is easiest for you.

Either's fine with me so I leave it up to you.

Thx.

Signature · 4 lines
Regards/Gruss,
    Boris.

https://people.kernel.org/tglx/notes-about-netiquette