driver core: class: remove struct class_interface * from callbacks

The add_dev and remove_dev callbacks in struct class_interface currently
pass in a pointer back to the class_interface structure that is calling
them, but none of the callback implementations actually use this pointer
as it is pointless (the structure is known, the driver passed it in in
the first place if it is really needed again.)

So clean this up and just remove the pointer from the callbacks and fix
up all callback functions.

Cc: Jean Delvare <jdelvare@suse.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Eric Dumazet <edumazet@google.com>
Cc: Jakub Kicinski <kuba@kernel.org>
Cc: Paolo Abeni <pabeni@redhat.com>
Cc: Kurt Schwemmer <kurt.schwemmer@microsemi.com>
Cc: Jon Mason <jdmason@kudzu.us>
Cc: Dave Jiang <dave.jiang@intel.com>
Cc: Allen Hubbe <allenbh@gmail.com>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>
Cc: Matt Porter <mporter@kernel.crashing.org>
Cc: Alexandre Bounine <alex.bou9@gmail.com>
Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
Cc: Doug Gilbert <dgilbert@interlog.com>
Cc: John Stultz <jstultz@google.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Stephen Boyd <sboyd@kernel.org>
Cc: Hans de Goede <hdegoede@redhat.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Wang Weiyang <wangweiyang2@huawei.com>
Cc: Yang Yingliang <yangyingliang@huawei.com>
Cc: Jakob Koschel <jakobkoschel@gmail.com>
Cc: Cai Xinchen <caixinchen1@huawei.com>
Acked-by: Rafael J. Wysocki <rafael@kernel.org>
Acked-by: Logan Gunthorpe <logang@deltatee.com>
Link: https://lore.kernel.org/r/2023040250-pushover-platter-509c@gregkh
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/base/class.c b/drivers/base/class.c
index ad8b9f1..ac1808d 100644 (file)
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -486,7 +486,7 @@ int class_interface_register(struct class_interface *class_intf)
        if (class_intf->add_dev) {
                class_dev_iter_init(&iter, parent, NULL, NULL);
                while ((dev = class_dev_iter_next(&iter)))
-                       class_intf->add_dev(dev, class_intf);
+                       class_intf->add_dev(dev);
                class_dev_iter_exit(&iter);
        }
        mutex_unlock(&sp->mutex);
@@ -514,7 +514,7 @@ void class_interface_unregister(struct class_interface *class_intf)
        if (class_intf->remove_dev) {
                class_dev_iter_init(&iter, parent, NULL, NULL);
                while ((dev = class_dev_iter_next(&iter)))
-                       class_intf->remove_dev(dev, class_intf);
+                       class_intf->remove_dev(dev);
                class_dev_iter_exit(&iter);
        }
        mutex_unlock(&sp->mutex);

diff --git a/drivers/base/core.c b/drivers/base/core.c
index 64d188b..7a42d1b 100644 (file)
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -541,8 +541,7 @@ static struct class devlink_class = {
        .dev_release = devlink_dev_release,
 };
 
-static int devlink_add_symlinks(struct device *dev,
-                               struct class_interface *class_intf)
+static int devlink_add_symlinks(struct device *dev)
 {
        int ret;
        size_t len;
@@ -591,8 +590,7 @@ out:
        return ret;
 }
 
-static void devlink_remove_symlinks(struct device *dev,
-                                  struct class_interface *class_intf)
+static void devlink_remove_symlinks(struct device *dev)
 {
        struct device_link *link = to_devlink(dev);
        size_t len;
@@ -3647,7 +3645,7 @@ int device_add(struct device *dev)
                /* notify any interfaces that the device is here */
                list_for_each_entry(class_intf, &sp->interfaces, node)
                        if (class_intf->add_dev)
-                               class_intf->add_dev(dev, class_intf);
+                               class_intf->add_dev(dev);
                mutex_unlock(&sp->mutex);
                subsys_put(sp);
        }
@@ -3805,7 +3803,7 @@ void device_del(struct device *dev)
                /* notify any interfaces that the device is now gone */
                list_for_each_entry(class_intf, &sp->interfaces, node)
                        if (class_intf->remove_dev)
-                               class_intf->remove_dev(dev, class_intf);
+                               class_intf->remove_dev(dev);
                /* remove the device from the class list */
                klist_del(&dev->p->knode_class);
                mutex_unlock(&sp->mutex);

diff --git a/drivers/hwmon/drivetemp.c b/drivers/hwmon/drivetemp.c
index 8e5759b..8617103 100644 (file)
--- a/drivers/hwmon/drivetemp.c
+++ b/drivers/hwmon/drivetemp.c
@@ -550,7 +550,7 @@ static const struct hwmon_chip_info drivetemp_chip_info = {
  * The device argument points to sdev->sdev_dev. Its parent is
  * sdev->sdev_gendev, which we can use to get the scsi_device pointer.
  */
-static int drivetemp_add(struct device *dev, struct class_interface *intf)
+static int drivetemp_add(struct device *dev)
 {
        struct scsi_device *sdev = to_scsi_device(dev->parent);
        struct drivetemp_data *st;
@@ -585,7 +585,7 @@ abort:
        return err;
 }
 
-static void drivetemp_remove(struct device *dev, struct class_interface *intf)
+static void drivetemp_remove(struct device *dev)
 {
        struct drivetemp_data *st, *tmp;
 

diff --git a/drivers/net/rionet.c b/drivers/net/rionet.c
index fbcb9d0..4eececc 100644 (file)
--- a/drivers/net/rionet.c
+++ b/drivers/net/rionet.c
@@ -662,8 +662,7 @@ static int rionet_shutdown(struct notifier_block *nb, unsigned long code,
        return NOTIFY_DONE;
 }
 
-static void rionet_remove_mport(struct device *dev,
-                               struct class_interface *class_intf)
+static void rionet_remove_mport(struct device *dev)
 {
        struct rio_mport *mport = to_rio_mport(dev);
        struct net_device *ndev;

diff --git a/drivers/ntb/hw/mscc/ntb_hw_switchtec.c b/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
index 88ae18b..d6bbcc7 100644 (file)
--- a/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
+++ b/drivers/ntb/hw/mscc/ntb_hw_switchtec.c
@@ -1470,8 +1470,7 @@ static int switchtec_ntb_reinit_peer(struct switchtec_ntb *sndev)
        return rc;
 }
 
-static int switchtec_ntb_add(struct device *dev,
-                            struct class_interface *class_intf)
+static int switchtec_ntb_add(struct device *dev)
 {
        struct switchtec_dev *stdev = to_stdev(dev);
        struct switchtec_ntb *sndev;
@@ -1541,8 +1540,7 @@ free_and_exit:
        return rc;
 }
 
-static void switchtec_ntb_remove(struct device *dev,
-                                struct class_interface *class_intf)
+static void switchtec_ntb_remove(struct device *dev)
 {
        struct switchtec_dev *stdev = to_stdev(dev);
        struct switchtec_ntb *sndev = stdev->sndev;

diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index c8087ef..d500e5d 100644 (file)
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -1335,8 +1335,7 @@ static struct pcmcia_callback pcmcia_bus_callback = {
        .resume = pcmcia_bus_resume,
 };
 
-static int pcmcia_bus_add_socket(struct device *dev,
-                                          struct class_interface *class_intf)
+static int pcmcia_bus_add_socket(struct device *dev)
 {
        struct pcmcia_socket *socket = dev_get_drvdata(dev);
        int ret;
@@ -1369,8 +1368,7 @@ static int pcmcia_bus_add_socket(struct device *dev,
        return 0;
 }
 
-static void pcmcia_bus_remove_socket(struct device *dev,
-                                    struct class_interface *class_intf)
+static void pcmcia_bus_remove_socket(struct device *dev)
 {
        struct pcmcia_socket *socket = dev_get_drvdata(dev);
 

diff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c
index ad1141f..471e0c5 100644 (file)
--- a/drivers/pcmcia/rsrc_nonstatic.c
+++ b/drivers/pcmcia/rsrc_nonstatic.c
@@ -1200,8 +1200,7 @@ static const struct attribute_group rsrc_attributes = {
        .attrs = pccard_rsrc_attributes,
 };
 
-static int pccard_sysfs_add_rsrc(struct device *dev,
-                                          struct class_interface *class_intf)
+static int pccard_sysfs_add_rsrc(struct device *dev)
 {
        struct pcmcia_socket *s = dev_get_drvdata(dev);
 
@@ -1210,8 +1209,7 @@ static int pccard_sysfs_add_rsrc(struct device *dev,
        return sysfs_create_group(&dev->kobj, &rsrc_attributes);
 }
 
-static void pccard_sysfs_remove_rsrc(struct device *dev,
-                                              struct class_interface *class_intf)
+static void pccard_sysfs_remove_rsrc(struct device *dev)
 {
        struct pcmcia_socket *s = dev_get_drvdata(dev);
 

diff --git a/drivers/rapidio/devices/rio_mport_cdev.c b/drivers/rapidio/devices/rio_mport_cdev.c
index deb96c3..a115730 100644 (file)
--- a/drivers/rapidio/devices/rio_mport_cdev.c
+++ b/drivers/rapidio/devices/rio_mport_cdev.c
@@ -2536,10 +2536,8 @@ static void mport_cdev_remove(struct mport_dev *md)
 /*
  * mport_add_mport() - Add rio_mport from LDM device struct
  * @dev:               Linux device model struct
- * @class_intf:        Linux class_interface
  */
-static int mport_add_mport(struct device *dev,
-               struct class_interface *class_intf)
+static int mport_add_mport(struct device *dev)
 {
        struct rio_mport *mport = NULL;
        struct mport_dev *chdev = NULL;
@@ -2559,8 +2557,7 @@ static int mport_add_mport(struct device *dev,
  * mport_remove_mport() - Remove rio_mport from global list
  * TODO remove device from global mport_dev list
  */
-static void mport_remove_mport(struct device *dev,
-               struct class_interface *class_intf)
+static void mport_remove_mport(struct device *dev)
 {
        struct rio_mport *mport = NULL;
        struct mport_dev *chdev;

diff --git a/drivers/rapidio/rio_cm.c b/drivers/rapidio/rio_cm.c
index acaf9cd..49f8d11 100644 (file)
--- a/drivers/rapidio/rio_cm.c
+++ b/drivers/rapidio/rio_cm.c
@@ -2087,13 +2087,11 @@ static int riocm_cdev_add(dev_t devno)
 /*
  * riocm_add_mport - add new local mport device into channel management core
  * @dev: device object associated with mport
- * @class_intf: class interface
  *
  * When a new mport device is added, CM immediately reserves inbound and
  * outbound RapidIO mailboxes that will be used.
  */
-static int riocm_add_mport(struct device *dev,
-                          struct class_interface *class_intf)
+static int riocm_add_mport(struct device *dev)
 {
        int rc;
        int i;
@@ -2166,14 +2164,12 @@ static int riocm_add_mport(struct device *dev,
 /*
  * riocm_remove_mport - remove local mport device from channel management core
  * @dev: device object associated with mport
- * @class_intf: class interface
  *
  * Removes a local mport device from the list of registered devices that provide
  * channel management services. Returns an error if the specified mport is not
  * registered with the CM core.
  */
-static void riocm_remove_mport(struct device *dev,
-                              struct class_interface *class_intf)
+static void riocm_remove_mport(struct device *dev)
 {
        struct rio_mport *mport = to_rio_mport(dev);
        struct cm_dev *cm;

diff --git a/drivers/scsi/ses.c b/drivers/scsi/ses.c
index b11a916..57feb0c 100644 (file)
--- a/drivers/scsi/ses.c
+++ b/drivers/scsi/ses.c
@@ -663,8 +663,7 @@ static void ses_match_to_enclosure(struct enclosure_device *edev,
        }
 }
 
-static int ses_intf_add(struct device *cdev,
-                       struct class_interface *intf)
+static int ses_intf_add(struct device *cdev)
 {
        struct scsi_device *sdev = to_scsi_device(cdev->parent);
        struct scsi_device *tmp_sdev;
@@ -869,8 +868,7 @@ static void ses_intf_remove_enclosure(struct scsi_device *sdev)
        enclosure_unregister(edev);
 }
 
-static void ses_intf_remove(struct device *cdev,
-                           struct class_interface *intf)
+static void ses_intf_remove(struct device *cdev)
 {
        struct scsi_device *sdev = to_scsi_device(cdev->parent);
 

diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 4997f88..037f8c9 100644 (file)
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -96,8 +96,8 @@ static int scatter_elem_sz_prev = SG_SCATTER_SZ;
 
 #define SG_SECTOR_SZ 512
 
-static int sg_add_device(struct device *, struct class_interface *);
-static void sg_remove_device(struct device *, struct class_interface *);
+static int sg_add_device(struct device *);
+static void sg_remove_device(struct device *);
 
 static DEFINE_IDR(sg_index_idr);
 static DEFINE_RWLOCK(sg_index_lock);   /* Also used to lock
@@ -1488,7 +1488,7 @@ out_unlock:
 }
 
 static int
-sg_add_device(struct device *cl_dev, struct class_interface *cl_intf)
+sg_add_device(struct device *cl_dev)
 {
        struct scsi_device *scsidp = to_scsi_device(cl_dev->parent);
        Sg_device *sdp = NULL;
@@ -1578,7 +1578,7 @@ sg_device_destroy(struct kref *kref)
 }
 
 static void
-sg_remove_device(struct device *cl_dev, struct class_interface *cl_intf)
+sg_remove_device(struct device *cl_dev)
 {
        struct scsi_device *scsidp = to_scsi_device(cl_dev->parent);
        Sg_device *sdp = dev_get_drvdata(cl_dev);

diff --git a/include/linux/device/class.h b/include/linux/device/class.h
index 53287aa..9deeaeb 100644 (file)
--- a/include/linux/device/class.h
+++ b/include/linux/device/class.h
@@ -219,8 +219,8 @@ struct class_interface {
        struct list_head        node;
        const struct class      *class;
 
-       int (*add_dev)          (struct device *, struct class_interface *);
-       void (*remove_dev)      (struct device *, struct class_interface *);
+       int (*add_dev)          (struct device *dev);
+       void (*remove_dev)      (struct device *dev);
 };
 
 int __must_check class_interface_register(struct class_interface *);

diff --git a/kernel/time/alarmtimer.c b/kernel/time/alarmtimer.c
index 7e5dff6..82b28ab 100644 (file)
--- a/kernel/time/alarmtimer.c
+++ b/kernel/time/alarmtimer.c
@@ -81,8 +81,7 @@ struct rtc_device *alarmtimer_get_rtcdev(void)
 }
 EXPORT_SYMBOL_GPL(alarmtimer_get_rtcdev);
 
-static int alarmtimer_rtc_add_device(struct device *dev,
-                               struct class_interface *class_intf)
+static int alarmtimer_rtc_add_device(struct device *dev)
 {
        unsigned long flags;
        struct rtc_device *rtc = to_rtc_device(dev);