Skip to content

Commit

Permalink
EDAC: constantify the struct bus_type usage
Browse files Browse the repository at this point in the history
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 <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>
Link: https://lore.kernel.org/r/2023121909-tribute-punctuate-4b22@gregkh
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
gregkh committed Jan 4, 2024
1 parent c810729 commit f36be9c
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion drivers/edac/edac_device.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/edac/edac_device_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions drivers/edac/edac_module.c
Original file line number Diff line number Diff line change
Expand Up @@ -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",
};
Expand All @@ -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;
}
Expand Down
2 changes: 1 addition & 1 deletion drivers/edac/edac_pci_sysfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions include/linux/edac.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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 */

Expand Down

0 comments on commit f36be9c

Please sign in to comment.