| Message ID | 20221123122523.1332370-1-gregkh@linuxfoundation.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [1/5] driver core: make struct class.dev_uevent() take a const * | expand |
On Wed, Nov 23, 2022 at 1:25 PM Greg Kroah-Hartman <gregkh@linuxfoundation.org> wrote: > > The dev_uevent() in struct class should not be modifying the device that > is passed into it, so mark it as a const * and propagate the function > signature changes out into all relevant subsystems that use this > callback. > > Cc: Jens Axboe <axboe@kernel.dk> > Cc: Luis Chamberlain <mcgrof@kernel.org> > Cc: Russ Weight <russell.h.weight@intel.com> > Cc: "Rafael J. Wysocki" <rafael@kernel.org> > Cc: Jean Delvare <jdelvare@suse.com> > Cc: Johan Hovold <johan@kernel.org> > Cc: Jason Gunthorpe <jgg@ziepe.ca> > Cc: Leon Romanovsky <leon@kernel.org> > Cc: Karsten Keil <isdn@linux-pingi.de> > Cc: Mauro Carvalho Chehab <mchehab@kernel.org> > Cc: Keith Busch <kbusch@kernel.org> > Cc: Christoph Hellwig <hch@lst.de> > Cc: Sagi Grimberg <sagi@grimberg.me> > Cc: Dominik Brodowski <linux@dominikbrodowski.net> > Cc: Sebastian Reichel <sre@kernel.org> > 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: Johannes Berg <johannes@sipsolutions.net> > Cc: Wolfram Sang <wsa+renesas@sang-engineering.com> > Cc: Raed Salem <raeds@nvidia.com> > Cc: Chen Zhongjin <chenzhongjin@huawei.com> > Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> > Cc: Avihai Horon <avihaih@nvidia.com> > Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org> > Cc: Alan Stern <stern@rowland.harvard.edu> > Cc: Colin Ian King <colin.i.king@gmail.com> > Cc: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Jakob Koschel <jakobkoschel@gmail.com> > Cc: Antoine Tenart <atenart@kernel.org> > Cc: Frederic Weisbecker <frederic@kernel.org> > Cc: Wang Yufen <wangyufen@huawei.com> > Cc: linux-block@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Cc: linux-media@vger.kernel.org > Cc: linux-nvme@lists.infradead.org > Cc: linux-pm@vger.kernel.org > Cc: linux-rdma@vger.kernel.org > Cc: linux-usb@vger.kernel.org > Cc: linux-wireless@vger.kernel.org > Cc: netdev@vger.kernel.org > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Rafael J. Wysocki <rafael@kernel.org> > --- > block/genhd.c | 4 ++-- > drivers/base/firmware_loader/sysfs.c | 6 +++--- > drivers/base/firmware_loader/sysfs.h | 2 +- > drivers/firmware/dmi-id.c | 2 +- > drivers/gnss/core.c | 6 +++--- > drivers/infiniband/core/device.c | 2 +- > drivers/isdn/mISDN/core.c | 4 ++-- > drivers/media/dvb-core/dvbdev.c | 4 ++-- > drivers/nvme/host/core.c | 4 ++-- > drivers/pcmcia/cs.c | 4 ++-- > drivers/power/supply/power_supply.h | 2 +- > drivers/power/supply/power_supply_sysfs.c | 8 ++++---- > drivers/usb/gadget/udc/core.c | 4 ++-- > include/linux/device/class.h | 2 +- > include/linux/mISDNif.h | 2 +- > net/atm/atm_sysfs.c | 4 ++-- > net/core/net-sysfs.c | 4 ++-- > net/rfkill/core.c | 2 +- > 18 files changed, 33 insertions(+), 33 deletions(-) > > diff --git a/block/genhd.c b/block/genhd.c > index 0f9769db2de8..3f1124713442 100644 > --- a/block/genhd.c > +++ b/block/genhd.c > @@ -1181,9 +1181,9 @@ static void disk_release(struct device *dev) > iput(disk->part0->bd_inode); /* frees the disk */ > } > > -static int block_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int block_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct gendisk *disk = dev_to_disk(dev); > + const struct gendisk *disk = dev_to_disk(dev); > > return add_uevent_var(env, "DISKSEQ=%llu", disk->diskseq); > } > diff --git a/drivers/base/firmware_loader/sysfs.c b/drivers/base/firmware_loader/sysfs.c > index 5b66b3d1fa16..56911d75b90a 100644 > --- a/drivers/base/firmware_loader/sysfs.c > +++ b/drivers/base/firmware_loader/sysfs.c > @@ -64,7 +64,7 @@ static struct attribute *firmware_class_attrs[] = { > }; > ATTRIBUTE_GROUPS(firmware_class); > > -static int do_firmware_uevent(struct fw_sysfs *fw_sysfs, struct kobj_uevent_env *env) > +static int do_firmware_uevent(const struct fw_sysfs *fw_sysfs, struct kobj_uevent_env *env) > { > if (add_uevent_var(env, "FIRMWARE=%s", fw_sysfs->fw_priv->fw_name)) > return -ENOMEM; > @@ -76,9 +76,9 @@ static int do_firmware_uevent(struct fw_sysfs *fw_sysfs, struct kobj_uevent_env > return 0; > } > > -static int firmware_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int firmware_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct fw_sysfs *fw_sysfs = to_fw_sysfs(dev); > + const struct fw_sysfs *fw_sysfs = to_fw_sysfs(dev); > int err = 0; > > mutex_lock(&fw_lock); > diff --git a/drivers/base/firmware_loader/sysfs.h b/drivers/base/firmware_loader/sysfs.h > index df1d5add698f..fd0b4ad9bdbb 100644 > --- a/drivers/base/firmware_loader/sysfs.h > +++ b/drivers/base/firmware_loader/sysfs.h > @@ -81,7 +81,7 @@ struct fw_sysfs { > void *fw_upload_priv; > }; > > -static inline struct fw_sysfs *to_fw_sysfs(struct device *dev) > +static inline struct fw_sysfs *to_fw_sysfs(const struct device *dev) > { > return container_of(dev, struct fw_sysfs, dev); > } > diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c > index 940ddf916202..5f3a3e913d28 100644 > --- a/drivers/firmware/dmi-id.c > +++ b/drivers/firmware/dmi-id.c > @@ -155,7 +155,7 @@ static const struct attribute_group* sys_dmi_attribute_groups[] = { > NULL > }; > > -static int dmi_dev_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int dmi_dev_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > ssize_t len; > > diff --git a/drivers/gnss/core.c b/drivers/gnss/core.c > index 1e82b7967570..77a4b280c552 100644 > --- a/drivers/gnss/core.c > +++ b/drivers/gnss/core.c > @@ -337,7 +337,7 @@ static const char * const gnss_type_names[GNSS_TYPE_COUNT] = { > [GNSS_TYPE_MTK] = "MTK", > }; > > -static const char *gnss_type_name(struct gnss_device *gdev) > +static const char *gnss_type_name(const struct gnss_device *gdev) > { > const char *name = NULL; > > @@ -365,9 +365,9 @@ static struct attribute *gnss_attrs[] = { > }; > ATTRIBUTE_GROUPS(gnss); > > -static int gnss_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int gnss_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct gnss_device *gdev = to_gnss_device(dev); > + const struct gnss_device *gdev = to_gnss_device(dev); > int ret; > > ret = add_uevent_var(env, "GNSS_TYPE=%s", gnss_type_name(gdev)); > diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c > index fa65c5d3d395..4186dbf9377f 100644 > --- a/drivers/infiniband/core/device.c > +++ b/drivers/infiniband/core/device.c > @@ -511,7 +511,7 @@ static void ib_device_release(struct device *device) > kfree_rcu(dev, rcu_head); > } > > -static int ib_device_uevent(struct device *device, > +static int ib_device_uevent(const struct device *device, > struct kobj_uevent_env *env) > { > if (add_uevent_var(env, "NAME=%s", dev_name(device))) > diff --git a/drivers/isdn/mISDN/core.c b/drivers/isdn/mISDN/core.c > index 90ee56d07a6e..9120be590325 100644 > --- a/drivers/isdn/mISDN/core.c > +++ b/drivers/isdn/mISDN/core.c > @@ -139,9 +139,9 @@ static struct attribute *mISDN_attrs[] = { > }; > ATTRIBUTE_GROUPS(mISDN); > > -static int mISDN_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int mISDN_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct mISDNdevice *mdev = dev_to_mISDN(dev); > + const struct mISDNdevice *mdev = dev_to_mISDN(dev); > > if (!mdev) > return 0; > diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c > index 675d877a67b2..6ef18bab9648 100644 > --- a/drivers/media/dvb-core/dvbdev.c > +++ b/drivers/media/dvb-core/dvbdev.c > @@ -1008,9 +1008,9 @@ void dvb_module_release(struct i2c_client *client) > EXPORT_SYMBOL_GPL(dvb_module_release); > #endif > > -static int dvb_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int dvb_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct dvb_device *dvbdev = dev_get_drvdata(dev); > + const struct dvb_device *dvbdev = dev_get_drvdata(dev); > > add_uevent_var(env, "DVB_ADAPTER_NUM=%d", dvbdev->adapter->num); > add_uevent_var(env, "DVB_DEVICE_TYPE=%s", dnames[dvbdev->type]); > diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c > index da55ce45ac70..b4778b970dd4 100644 > --- a/drivers/nvme/host/core.c > +++ b/drivers/nvme/host/core.c > @@ -4580,9 +4580,9 @@ void nvme_remove_namespaces(struct nvme_ctrl *ctrl) > } > EXPORT_SYMBOL_GPL(nvme_remove_namespaces); > > -static int nvme_class_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int nvme_class_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct nvme_ctrl *ctrl = > + const struct nvme_ctrl *ctrl = > container_of(dev, struct nvme_ctrl, ctrl_device); > struct nvmf_ctrl_options *opts = ctrl->opts; > int ret; > diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c > index f70197154a36..e3224e49c43f 100644 > --- a/drivers/pcmcia/cs.c > +++ b/drivers/pcmcia/cs.c > @@ -810,10 +810,10 @@ int pcmcia_reset_card(struct pcmcia_socket *skt) > EXPORT_SYMBOL(pcmcia_reset_card); > > > -static int pcmcia_socket_uevent(struct device *dev, > +static int pcmcia_socket_uevent(const struct device *dev, > struct kobj_uevent_env *env) > { > - struct pcmcia_socket *s = container_of(dev, struct pcmcia_socket, dev); > + const struct pcmcia_socket *s = container_of(dev, struct pcmcia_socket, dev); > > if (add_uevent_var(env, "SOCKET_NO=%u", s->sock)) > return -ENOMEM; > diff --git a/drivers/power/supply/power_supply.h b/drivers/power/supply/power_supply.h > index c310d4f36c10..645eee4d6b6a 100644 > --- a/drivers/power/supply/power_supply.h > +++ b/drivers/power/supply/power_supply.h > @@ -16,7 +16,7 @@ struct power_supply; > #ifdef CONFIG_SYSFS > > extern void power_supply_init_attrs(struct device_type *dev_type); > -extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env); > +extern int power_supply_uevent(const struct device *dev, struct kobj_uevent_env *env); > > #else > > diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c > index 5369abaceb5c..6ca7d3985a40 100644 > --- a/drivers/power/supply/power_supply_sysfs.c > +++ b/drivers/power/supply/power_supply_sysfs.c > @@ -427,7 +427,7 @@ void power_supply_init_attrs(struct device_type *dev_type) > } > } > > -static int add_prop_uevent(struct device *dev, struct kobj_uevent_env *env, > +static int add_prop_uevent(const struct device *dev, struct kobj_uevent_env *env, > enum power_supply_property prop, char *prop_buf) > { > int ret = 0; > @@ -438,7 +438,7 @@ static int add_prop_uevent(struct device *dev, struct kobj_uevent_env *env, > pwr_attr = &power_supply_attrs[prop]; > dev_attr = &pwr_attr->dev_attr; > > - ret = power_supply_show_property(dev, dev_attr, prop_buf); > + ret = power_supply_show_property((struct device *)dev, dev_attr, prop_buf); > if (ret == -ENODEV || ret == -ENODATA) { > /* > * When a battery is absent, we expect -ENODEV. Don't abort; > @@ -458,9 +458,9 @@ static int add_prop_uevent(struct device *dev, struct kobj_uevent_env *env, > pwr_attr->prop_name, prop_buf); > } > > -int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env) > +int power_supply_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct power_supply *psy = dev_get_drvdata(dev); > + const struct power_supply *psy = dev_get_drvdata(dev); > int ret = 0, j; > char *prop_buf; > > diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c > index c63c0c2cf649..b5994a0604f6 100644 > --- a/drivers/usb/gadget/udc/core.c > +++ b/drivers/usb/gadget/udc/core.c > @@ -1723,9 +1723,9 @@ static const struct attribute_group *usb_udc_attr_groups[] = { > NULL, > }; > > -static int usb_udc_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int usb_udc_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct usb_udc *udc = container_of(dev, struct usb_udc, dev); > + const struct usb_udc *udc = container_of(dev, struct usb_udc, dev); > int ret; > > ret = add_uevent_var(env, "USB_UDC_NAME=%s", udc->gadget->name); > diff --git a/include/linux/device/class.h b/include/linux/device/class.h > index 20103e0b03c3..94b1107258e5 100644 > --- a/include/linux/device/class.h > +++ b/include/linux/device/class.h > @@ -59,7 +59,7 @@ struct class { > const struct attribute_group **dev_groups; > struct kobject *dev_kobj; > > - int (*dev_uevent)(struct device *dev, struct kobj_uevent_env *env); > + int (*dev_uevent)(const struct device *dev, struct kobj_uevent_env *env); > char *(*devnode)(struct device *dev, umode_t *mode); > > void (*class_release)(struct class *class); > diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h > index 7dd1f01ec4f9..7aab4a769736 100644 > --- a/include/linux/mISDNif.h > +++ b/include/linux/mISDNif.h > @@ -586,7 +586,7 @@ extern struct mISDNclock *mISDN_register_clock(char *, int, clockctl_func_t *, > void *); > extern void mISDN_unregister_clock(struct mISDNclock *); > > -static inline struct mISDNdevice *dev_to_mISDN(struct device *dev) > +static inline struct mISDNdevice *dev_to_mISDN(const struct device *dev) > { > if (dev) > return dev_get_drvdata(dev); > diff --git a/net/atm/atm_sysfs.c b/net/atm/atm_sysfs.c > index 0fdbdfd19474..466353b3dde4 100644 > --- a/net/atm/atm_sysfs.c > +++ b/net/atm/atm_sysfs.c > @@ -108,9 +108,9 @@ static struct device_attribute *atm_attrs[] = { > }; > > > -static int atm_uevent(struct device *cdev, struct kobj_uevent_env *env) > +static int atm_uevent(const struct device *cdev, struct kobj_uevent_env *env) > { > - struct atm_dev *adev; > + const struct atm_dev *adev; > > if (!cdev) > return -ENODEV; > diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c > index 9cfc80b8ed25..03a61d1dffbd 100644 > --- a/net/core/net-sysfs.c > +++ b/net/core/net-sysfs.c > @@ -1873,9 +1873,9 @@ const struct kobj_ns_type_operations net_ns_type_operations = { > }; > EXPORT_SYMBOL_GPL(net_ns_type_operations); > > -static int netdev_uevent(struct device *d, struct kobj_uevent_env *env) > +static int netdev_uevent(const struct device *d, struct kobj_uevent_env *env) > { > - struct net_device *dev = to_net_dev(d); > + const struct net_device *dev = to_net_dev(d); > int retval; > > /* pass interface to uevent. */ > diff --git a/net/rfkill/core.c b/net/rfkill/core.c > index dac4fdc7488a..b390ff245d5e 100644 > --- a/net/rfkill/core.c > +++ b/net/rfkill/core.c > @@ -832,7 +832,7 @@ static void rfkill_release(struct device *dev) > kfree(rfkill); > } > > -static int rfkill_dev_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int rfkill_dev_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > struct rfkill *rfkill = to_rfkill(dev); > unsigned long flags; > -- > 2.38.1 >
Hi, On Wed, Nov 23, 2022 at 01:25:19PM +0100, Greg Kroah-Hartman wrote: > The dev_uevent() in struct class should not be modifying the device that > is passed into it, so mark it as a const * and propagate the function > signature changes out into all relevant subsystems that use this > callback. > > Cc: Jens Axboe <axboe@kernel.dk> > Cc: Luis Chamberlain <mcgrof@kernel.org> > Cc: Russ Weight <russell.h.weight@intel.com> > Cc: "Rafael J. Wysocki" <rafael@kernel.org> > Cc: Jean Delvare <jdelvare@suse.com> > Cc: Johan Hovold <johan@kernel.org> > Cc: Jason Gunthorpe <jgg@ziepe.ca> > Cc: Leon Romanovsky <leon@kernel.org> > Cc: Karsten Keil <isdn@linux-pingi.de> > Cc: Mauro Carvalho Chehab <mchehab@kernel.org> > Cc: Keith Busch <kbusch@kernel.org> > Cc: Christoph Hellwig <hch@lst.de> > Cc: Sagi Grimberg <sagi@grimberg.me> > Cc: Dominik Brodowski <linux@dominikbrodowski.net> > Cc: Sebastian Reichel <sre@kernel.org> > 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: Johannes Berg <johannes@sipsolutions.net> > Cc: Wolfram Sang <wsa+renesas@sang-engineering.com> > Cc: Raed Salem <raeds@nvidia.com> > Cc: Chen Zhongjin <chenzhongjin@huawei.com> > Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> > Cc: Avihai Horon <avihaih@nvidia.com> > Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org> > Cc: Alan Stern <stern@rowland.harvard.edu> > Cc: Colin Ian King <colin.i.king@gmail.com> > Cc: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Jakob Koschel <jakobkoschel@gmail.com> > Cc: Antoine Tenart <atenart@kernel.org> > Cc: Frederic Weisbecker <frederic@kernel.org> > Cc: Wang Yufen <wangyufen@huawei.com> > Cc: linux-block@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Cc: linux-media@vger.kernel.org > Cc: linux-nvme@lists.infradead.org > Cc: linux-pm@vger.kernel.org > Cc: linux-rdma@vger.kernel.org > Cc: linux-usb@vger.kernel.org > Cc: linux-wireless@vger.kernel.org > Cc: netdev@vger.kernel.org > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > --- Acked-by: Sebastian Reichel <sre@kernel.org> -- Sebastian > block/genhd.c | 4 ++-- > drivers/base/firmware_loader/sysfs.c | 6 +++--- > drivers/base/firmware_loader/sysfs.h | 2 +- > drivers/firmware/dmi-id.c | 2 +- > drivers/gnss/core.c | 6 +++--- > drivers/infiniband/core/device.c | 2 +- > drivers/isdn/mISDN/core.c | 4 ++-- > drivers/media/dvb-core/dvbdev.c | 4 ++-- > drivers/nvme/host/core.c | 4 ++-- > drivers/pcmcia/cs.c | 4 ++-- > drivers/power/supply/power_supply.h | 2 +- > drivers/power/supply/power_supply_sysfs.c | 8 ++++---- > drivers/usb/gadget/udc/core.c | 4 ++-- > include/linux/device/class.h | 2 +- > include/linux/mISDNif.h | 2 +- > net/atm/atm_sysfs.c | 4 ++-- > net/core/net-sysfs.c | 4 ++-- > net/rfkill/core.c | 2 +- > 18 files changed, 33 insertions(+), 33 deletions(-) > > diff --git a/block/genhd.c b/block/genhd.c > index 0f9769db2de8..3f1124713442 100644 > --- a/block/genhd.c > +++ b/block/genhd.c > @@ -1181,9 +1181,9 @@ static void disk_release(struct device *dev) > iput(disk->part0->bd_inode); /* frees the disk */ > } > > -static int block_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int block_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct gendisk *disk = dev_to_disk(dev); > + const struct gendisk *disk = dev_to_disk(dev); > > return add_uevent_var(env, "DISKSEQ=%llu", disk->diskseq); > } > diff --git a/drivers/base/firmware_loader/sysfs.c b/drivers/base/firmware_loader/sysfs.c > index 5b66b3d1fa16..56911d75b90a 100644 > --- a/drivers/base/firmware_loader/sysfs.c > +++ b/drivers/base/firmware_loader/sysfs.c > @@ -64,7 +64,7 @@ static struct attribute *firmware_class_attrs[] = { > }; > ATTRIBUTE_GROUPS(firmware_class); > > -static int do_firmware_uevent(struct fw_sysfs *fw_sysfs, struct kobj_uevent_env *env) > +static int do_firmware_uevent(const struct fw_sysfs *fw_sysfs, struct kobj_uevent_env *env) > { > if (add_uevent_var(env, "FIRMWARE=%s", fw_sysfs->fw_priv->fw_name)) > return -ENOMEM; > @@ -76,9 +76,9 @@ static int do_firmware_uevent(struct fw_sysfs *fw_sysfs, struct kobj_uevent_env > return 0; > } > > -static int firmware_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int firmware_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct fw_sysfs *fw_sysfs = to_fw_sysfs(dev); > + const struct fw_sysfs *fw_sysfs = to_fw_sysfs(dev); > int err = 0; > > mutex_lock(&fw_lock); > diff --git a/drivers/base/firmware_loader/sysfs.h b/drivers/base/firmware_loader/sysfs.h > index df1d5add698f..fd0b4ad9bdbb 100644 > --- a/drivers/base/firmware_loader/sysfs.h > +++ b/drivers/base/firmware_loader/sysfs.h > @@ -81,7 +81,7 @@ struct fw_sysfs { > void *fw_upload_priv; > }; > > -static inline struct fw_sysfs *to_fw_sysfs(struct device *dev) > +static inline struct fw_sysfs *to_fw_sysfs(const struct device *dev) > { > return container_of(dev, struct fw_sysfs, dev); > } > diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c > index 940ddf916202..5f3a3e913d28 100644 > --- a/drivers/firmware/dmi-id.c > +++ b/drivers/firmware/dmi-id.c > @@ -155,7 +155,7 @@ static const struct attribute_group* sys_dmi_attribute_groups[] = { > NULL > }; > > -static int dmi_dev_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int dmi_dev_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > ssize_t len; > > diff --git a/drivers/gnss/core.c b/drivers/gnss/core.c > index 1e82b7967570..77a4b280c552 100644 > --- a/drivers/gnss/core.c > +++ b/drivers/gnss/core.c > @@ -337,7 +337,7 @@ static const char * const gnss_type_names[GNSS_TYPE_COUNT] = { > [GNSS_TYPE_MTK] = "MTK", > }; > > -static const char *gnss_type_name(struct gnss_device *gdev) > +static const char *gnss_type_name(const struct gnss_device *gdev) > { > const char *name = NULL; > > @@ -365,9 +365,9 @@ static struct attribute *gnss_attrs[] = { > }; > ATTRIBUTE_GROUPS(gnss); > > -static int gnss_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int gnss_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct gnss_device *gdev = to_gnss_device(dev); > + const struct gnss_device *gdev = to_gnss_device(dev); > int ret; > > ret = add_uevent_var(env, "GNSS_TYPE=%s", gnss_type_name(gdev)); > diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c > index fa65c5d3d395..4186dbf9377f 100644 > --- a/drivers/infiniband/core/device.c > +++ b/drivers/infiniband/core/device.c > @@ -511,7 +511,7 @@ static void ib_device_release(struct device *device) > kfree_rcu(dev, rcu_head); > } > > -static int ib_device_uevent(struct device *device, > +static int ib_device_uevent(const struct device *device, > struct kobj_uevent_env *env) > { > if (add_uevent_var(env, "NAME=%s", dev_name(device))) > diff --git a/drivers/isdn/mISDN/core.c b/drivers/isdn/mISDN/core.c > index 90ee56d07a6e..9120be590325 100644 > --- a/drivers/isdn/mISDN/core.c > +++ b/drivers/isdn/mISDN/core.c > @@ -139,9 +139,9 @@ static struct attribute *mISDN_attrs[] = { > }; > ATTRIBUTE_GROUPS(mISDN); > > -static int mISDN_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int mISDN_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct mISDNdevice *mdev = dev_to_mISDN(dev); > + const struct mISDNdevice *mdev = dev_to_mISDN(dev); > > if (!mdev) > return 0; > diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c > index 675d877a67b2..6ef18bab9648 100644 > --- a/drivers/media/dvb-core/dvbdev.c > +++ b/drivers/media/dvb-core/dvbdev.c > @@ -1008,9 +1008,9 @@ void dvb_module_release(struct i2c_client *client) > EXPORT_SYMBOL_GPL(dvb_module_release); > #endif > > -static int dvb_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int dvb_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct dvb_device *dvbdev = dev_get_drvdata(dev); > + const struct dvb_device *dvbdev = dev_get_drvdata(dev); > > add_uevent_var(env, "DVB_ADAPTER_NUM=%d", dvbdev->adapter->num); > add_uevent_var(env, "DVB_DEVICE_TYPE=%s", dnames[dvbdev->type]); > diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c > index da55ce45ac70..b4778b970dd4 100644 > --- a/drivers/nvme/host/core.c > +++ b/drivers/nvme/host/core.c > @@ -4580,9 +4580,9 @@ void nvme_remove_namespaces(struct nvme_ctrl *ctrl) > } > EXPORT_SYMBOL_GPL(nvme_remove_namespaces); > > -static int nvme_class_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int nvme_class_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct nvme_ctrl *ctrl = > + const struct nvme_ctrl *ctrl = > container_of(dev, struct nvme_ctrl, ctrl_device); > struct nvmf_ctrl_options *opts = ctrl->opts; > int ret; > diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c > index f70197154a36..e3224e49c43f 100644 > --- a/drivers/pcmcia/cs.c > +++ b/drivers/pcmcia/cs.c > @@ -810,10 +810,10 @@ int pcmcia_reset_card(struct pcmcia_socket *skt) > EXPORT_SYMBOL(pcmcia_reset_card); > > > -static int pcmcia_socket_uevent(struct device *dev, > +static int pcmcia_socket_uevent(const struct device *dev, > struct kobj_uevent_env *env) > { > - struct pcmcia_socket *s = container_of(dev, struct pcmcia_socket, dev); > + const struct pcmcia_socket *s = container_of(dev, struct pcmcia_socket, dev); > > if (add_uevent_var(env, "SOCKET_NO=%u", s->sock)) > return -ENOMEM; > diff --git a/drivers/power/supply/power_supply.h b/drivers/power/supply/power_supply.h > index c310d4f36c10..645eee4d6b6a 100644 > --- a/drivers/power/supply/power_supply.h > +++ b/drivers/power/supply/power_supply.h > @@ -16,7 +16,7 @@ struct power_supply; > #ifdef CONFIG_SYSFS > > extern void power_supply_init_attrs(struct device_type *dev_type); > -extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env); > +extern int power_supply_uevent(const struct device *dev, struct kobj_uevent_env *env); > > #else > > diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c > index 5369abaceb5c..6ca7d3985a40 100644 > --- a/drivers/power/supply/power_supply_sysfs.c > +++ b/drivers/power/supply/power_supply_sysfs.c > @@ -427,7 +427,7 @@ void power_supply_init_attrs(struct device_type *dev_type) > } > } > > -static int add_prop_uevent(struct device *dev, struct kobj_uevent_env *env, > +static int add_prop_uevent(const struct device *dev, struct kobj_uevent_env *env, > enum power_supply_property prop, char *prop_buf) > { > int ret = 0; > @@ -438,7 +438,7 @@ static int add_prop_uevent(struct device *dev, struct kobj_uevent_env *env, > pwr_attr = &power_supply_attrs[prop]; > dev_attr = &pwr_attr->dev_attr; > > - ret = power_supply_show_property(dev, dev_attr, prop_buf); > + ret = power_supply_show_property((struct device *)dev, dev_attr, prop_buf); > if (ret == -ENODEV || ret == -ENODATA) { > /* > * When a battery is absent, we expect -ENODEV. Don't abort; > @@ -458,9 +458,9 @@ static int add_prop_uevent(struct device *dev, struct kobj_uevent_env *env, > pwr_attr->prop_name, prop_buf); > } > > -int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env) > +int power_supply_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct power_supply *psy = dev_get_drvdata(dev); > + const struct power_supply *psy = dev_get_drvdata(dev); > int ret = 0, j; > char *prop_buf; > > diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c > index c63c0c2cf649..b5994a0604f6 100644 > --- a/drivers/usb/gadget/udc/core.c > +++ b/drivers/usb/gadget/udc/core.c > @@ -1723,9 +1723,9 @@ static const struct attribute_group *usb_udc_attr_groups[] = { > NULL, > }; > > -static int usb_udc_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int usb_udc_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct usb_udc *udc = container_of(dev, struct usb_udc, dev); > + const struct usb_udc *udc = container_of(dev, struct usb_udc, dev); > int ret; > > ret = add_uevent_var(env, "USB_UDC_NAME=%s", udc->gadget->name); > diff --git a/include/linux/device/class.h b/include/linux/device/class.h > index 20103e0b03c3..94b1107258e5 100644 > --- a/include/linux/device/class.h > +++ b/include/linux/device/class.h > @@ -59,7 +59,7 @@ struct class { > const struct attribute_group **dev_groups; > struct kobject *dev_kobj; > > - int (*dev_uevent)(struct device *dev, struct kobj_uevent_env *env); > + int (*dev_uevent)(const struct device *dev, struct kobj_uevent_env *env); > char *(*devnode)(struct device *dev, umode_t *mode); > > void (*class_release)(struct class *class); > diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h > index 7dd1f01ec4f9..7aab4a769736 100644 > --- a/include/linux/mISDNif.h > +++ b/include/linux/mISDNif.h > @@ -586,7 +586,7 @@ extern struct mISDNclock *mISDN_register_clock(char *, int, clockctl_func_t *, > void *); > extern void mISDN_unregister_clock(struct mISDNclock *); > > -static inline struct mISDNdevice *dev_to_mISDN(struct device *dev) > +static inline struct mISDNdevice *dev_to_mISDN(const struct device *dev) > { > if (dev) > return dev_get_drvdata(dev); > diff --git a/net/atm/atm_sysfs.c b/net/atm/atm_sysfs.c > index 0fdbdfd19474..466353b3dde4 100644 > --- a/net/atm/atm_sysfs.c > +++ b/net/atm/atm_sysfs.c > @@ -108,9 +108,9 @@ static struct device_attribute *atm_attrs[] = { > }; > > > -static int atm_uevent(struct device *cdev, struct kobj_uevent_env *env) > +static int atm_uevent(const struct device *cdev, struct kobj_uevent_env *env) > { > - struct atm_dev *adev; > + const struct atm_dev *adev; > > if (!cdev) > return -ENODEV; > diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c > index 9cfc80b8ed25..03a61d1dffbd 100644 > --- a/net/core/net-sysfs.c > +++ b/net/core/net-sysfs.c > @@ -1873,9 +1873,9 @@ const struct kobj_ns_type_operations net_ns_type_operations = { > }; > EXPORT_SYMBOL_GPL(net_ns_type_operations); > > -static int netdev_uevent(struct device *d, struct kobj_uevent_env *env) > +static int netdev_uevent(const struct device *d, struct kobj_uevent_env *env) > { > - struct net_device *dev = to_net_dev(d); > + const struct net_device *dev = to_net_dev(d); > int retval; > > /* pass interface to uevent. */ > diff --git a/net/rfkill/core.c b/net/rfkill/core.c > index dac4fdc7488a..b390ff245d5e 100644 > --- a/net/rfkill/core.c > +++ b/net/rfkill/core.c > @@ -832,7 +832,7 @@ static void rfkill_release(struct device *dev) > kfree(rfkill); > } > > -static int rfkill_dev_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int rfkill_dev_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > struct rfkill *rfkill = to_rfkill(dev); > unsigned long flags; > -- > 2.38.1 >
Em Wed, 23 Nov 2022 13:25:19 +0100 Greg Kroah-Hartman <gregkh@linuxfoundation.org> escreveu: > The dev_uevent() in struct class should not be modifying the device that > is passed into it, so mark it as a const * and propagate the function > signature changes out into all relevant subsystems that use this > callback. Acked-by: Mauro Carvalho Chehab <mchehab@kernel.org> > > Cc: Jens Axboe <axboe@kernel.dk> > Cc: Luis Chamberlain <mcgrof@kernel.org> > Cc: Russ Weight <russell.h.weight@intel.com> > Cc: "Rafael J. Wysocki" <rafael@kernel.org> > Cc: Jean Delvare <jdelvare@suse.com> > Cc: Johan Hovold <johan@kernel.org> > Cc: Jason Gunthorpe <jgg@ziepe.ca> > Cc: Leon Romanovsky <leon@kernel.org> > Cc: Karsten Keil <isdn@linux-pingi.de> > Cc: Mauro Carvalho Chehab <mchehab@kernel.org> > Cc: Keith Busch <kbusch@kernel.org> > Cc: Christoph Hellwig <hch@lst.de> > Cc: Sagi Grimberg <sagi@grimberg.me> > Cc: Dominik Brodowski <linux@dominikbrodowski.net> > Cc: Sebastian Reichel <sre@kernel.org> > 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: Johannes Berg <johannes@sipsolutions.net> > Cc: Wolfram Sang <wsa+renesas@sang-engineering.com> > Cc: Raed Salem <raeds@nvidia.com> > Cc: Chen Zhongjin <chenzhongjin@huawei.com> > Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> > Cc: Avihai Horon <avihaih@nvidia.com> > Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org> > Cc: Alan Stern <stern@rowland.harvard.edu> > Cc: Colin Ian King <colin.i.king@gmail.com> > Cc: Geert Uytterhoeven <geert+renesas@glider.be> > Cc: Jakob Koschel <jakobkoschel@gmail.com> > Cc: Antoine Tenart <atenart@kernel.org> > Cc: Frederic Weisbecker <frederic@kernel.org> > Cc: Wang Yufen <wangyufen@huawei.com> > Cc: linux-block@vger.kernel.org > Cc: linux-kernel@vger.kernel.org > Cc: linux-media@vger.kernel.org > Cc: linux-nvme@lists.infradead.org > Cc: linux-pm@vger.kernel.org > Cc: linux-rdma@vger.kernel.org > Cc: linux-usb@vger.kernel.org > Cc: linux-wireless@vger.kernel.org > Cc: netdev@vger.kernel.org > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > --- > block/genhd.c | 4 ++-- > drivers/base/firmware_loader/sysfs.c | 6 +++--- > drivers/base/firmware_loader/sysfs.h | 2 +- > drivers/firmware/dmi-id.c | 2 +- > drivers/gnss/core.c | 6 +++--- > drivers/infiniband/core/device.c | 2 +- > drivers/isdn/mISDN/core.c | 4 ++-- > drivers/media/dvb-core/dvbdev.c | 4 ++-- > drivers/nvme/host/core.c | 4 ++-- > drivers/pcmcia/cs.c | 4 ++-- > drivers/power/supply/power_supply.h | 2 +- > drivers/power/supply/power_supply_sysfs.c | 8 ++++---- > drivers/usb/gadget/udc/core.c | 4 ++-- > include/linux/device/class.h | 2 +- > include/linux/mISDNif.h | 2 +- > net/atm/atm_sysfs.c | 4 ++-- > net/core/net-sysfs.c | 4 ++-- > net/rfkill/core.c | 2 +- > 18 files changed, 33 insertions(+), 33 deletions(-) > > diff --git a/block/genhd.c b/block/genhd.c > index 0f9769db2de8..3f1124713442 100644 > --- a/block/genhd.c > +++ b/block/genhd.c > @@ -1181,9 +1181,9 @@ static void disk_release(struct device *dev) > iput(disk->part0->bd_inode); /* frees the disk */ > } > > -static int block_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int block_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct gendisk *disk = dev_to_disk(dev); > + const struct gendisk *disk = dev_to_disk(dev); > > return add_uevent_var(env, "DISKSEQ=%llu", disk->diskseq); > } > diff --git a/drivers/base/firmware_loader/sysfs.c b/drivers/base/firmware_loader/sysfs.c > index 5b66b3d1fa16..56911d75b90a 100644 > --- a/drivers/base/firmware_loader/sysfs.c > +++ b/drivers/base/firmware_loader/sysfs.c > @@ -64,7 +64,7 @@ static struct attribute *firmware_class_attrs[] = { > }; > ATTRIBUTE_GROUPS(firmware_class); > > -static int do_firmware_uevent(struct fw_sysfs *fw_sysfs, struct kobj_uevent_env *env) > +static int do_firmware_uevent(const struct fw_sysfs *fw_sysfs, struct kobj_uevent_env *env) > { > if (add_uevent_var(env, "FIRMWARE=%s", fw_sysfs->fw_priv->fw_name)) > return -ENOMEM; > @@ -76,9 +76,9 @@ static int do_firmware_uevent(struct fw_sysfs *fw_sysfs, struct kobj_uevent_env > return 0; > } > > -static int firmware_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int firmware_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct fw_sysfs *fw_sysfs = to_fw_sysfs(dev); > + const struct fw_sysfs *fw_sysfs = to_fw_sysfs(dev); > int err = 0; > > mutex_lock(&fw_lock); > diff --git a/drivers/base/firmware_loader/sysfs.h b/drivers/base/firmware_loader/sysfs.h > index df1d5add698f..fd0b4ad9bdbb 100644 > --- a/drivers/base/firmware_loader/sysfs.h > +++ b/drivers/base/firmware_loader/sysfs.h > @@ -81,7 +81,7 @@ struct fw_sysfs { > void *fw_upload_priv; > }; > > -static inline struct fw_sysfs *to_fw_sysfs(struct device *dev) > +static inline struct fw_sysfs *to_fw_sysfs(const struct device *dev) > { > return container_of(dev, struct fw_sysfs, dev); > } > diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c > index 940ddf916202..5f3a3e913d28 100644 > --- a/drivers/firmware/dmi-id.c > +++ b/drivers/firmware/dmi-id.c > @@ -155,7 +155,7 @@ static const struct attribute_group* sys_dmi_attribute_groups[] = { > NULL > }; > > -static int dmi_dev_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int dmi_dev_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > ssize_t len; > > diff --git a/drivers/gnss/core.c b/drivers/gnss/core.c > index 1e82b7967570..77a4b280c552 100644 > --- a/drivers/gnss/core.c > +++ b/drivers/gnss/core.c > @@ -337,7 +337,7 @@ static const char * const gnss_type_names[GNSS_TYPE_COUNT] = { > [GNSS_TYPE_MTK] = "MTK", > }; > > -static const char *gnss_type_name(struct gnss_device *gdev) > +static const char *gnss_type_name(const struct gnss_device *gdev) > { > const char *name = NULL; > > @@ -365,9 +365,9 @@ static struct attribute *gnss_attrs[] = { > }; > ATTRIBUTE_GROUPS(gnss); > > -static int gnss_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int gnss_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct gnss_device *gdev = to_gnss_device(dev); > + const struct gnss_device *gdev = to_gnss_device(dev); > int ret; > > ret = add_uevent_var(env, "GNSS_TYPE=%s", gnss_type_name(gdev)); > diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c > index fa65c5d3d395..4186dbf9377f 100644 > --- a/drivers/infiniband/core/device.c > +++ b/drivers/infiniband/core/device.c > @@ -511,7 +511,7 @@ static void ib_device_release(struct device *device) > kfree_rcu(dev, rcu_head); > } > > -static int ib_device_uevent(struct device *device, > +static int ib_device_uevent(const struct device *device, > struct kobj_uevent_env *env) > { > if (add_uevent_var(env, "NAME=%s", dev_name(device))) > diff --git a/drivers/isdn/mISDN/core.c b/drivers/isdn/mISDN/core.c > index 90ee56d07a6e..9120be590325 100644 > --- a/drivers/isdn/mISDN/core.c > +++ b/drivers/isdn/mISDN/core.c > @@ -139,9 +139,9 @@ static struct attribute *mISDN_attrs[] = { > }; > ATTRIBUTE_GROUPS(mISDN); > > -static int mISDN_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int mISDN_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct mISDNdevice *mdev = dev_to_mISDN(dev); > + const struct mISDNdevice *mdev = dev_to_mISDN(dev); > > if (!mdev) > return 0; > diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c > index 675d877a67b2..6ef18bab9648 100644 > --- a/drivers/media/dvb-core/dvbdev.c > +++ b/drivers/media/dvb-core/dvbdev.c > @@ -1008,9 +1008,9 @@ void dvb_module_release(struct i2c_client *client) > EXPORT_SYMBOL_GPL(dvb_module_release); > #endif > > -static int dvb_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int dvb_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct dvb_device *dvbdev = dev_get_drvdata(dev); > + const struct dvb_device *dvbdev = dev_get_drvdata(dev); > > add_uevent_var(env, "DVB_ADAPTER_NUM=%d", dvbdev->adapter->num); > add_uevent_var(env, "DVB_DEVICE_TYPE=%s", dnames[dvbdev->type]); > diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c > index da55ce45ac70..b4778b970dd4 100644 > --- a/drivers/nvme/host/core.c > +++ b/drivers/nvme/host/core.c > @@ -4580,9 +4580,9 @@ void nvme_remove_namespaces(struct nvme_ctrl *ctrl) > } > EXPORT_SYMBOL_GPL(nvme_remove_namespaces); > > -static int nvme_class_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int nvme_class_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct nvme_ctrl *ctrl = > + const struct nvme_ctrl *ctrl = > container_of(dev, struct nvme_ctrl, ctrl_device); > struct nvmf_ctrl_options *opts = ctrl->opts; > int ret; > diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c > index f70197154a36..e3224e49c43f 100644 > --- a/drivers/pcmcia/cs.c > +++ b/drivers/pcmcia/cs.c > @@ -810,10 +810,10 @@ int pcmcia_reset_card(struct pcmcia_socket *skt) > EXPORT_SYMBOL(pcmcia_reset_card); > > > -static int pcmcia_socket_uevent(struct device *dev, > +static int pcmcia_socket_uevent(const struct device *dev, > struct kobj_uevent_env *env) > { > - struct pcmcia_socket *s = container_of(dev, struct pcmcia_socket, dev); > + const struct pcmcia_socket *s = container_of(dev, struct pcmcia_socket, dev); > > if (add_uevent_var(env, "SOCKET_NO=%u", s->sock)) > return -ENOMEM; > diff --git a/drivers/power/supply/power_supply.h b/drivers/power/supply/power_supply.h > index c310d4f36c10..645eee4d6b6a 100644 > --- a/drivers/power/supply/power_supply.h > +++ b/drivers/power/supply/power_supply.h > @@ -16,7 +16,7 @@ struct power_supply; > #ifdef CONFIG_SYSFS > > extern void power_supply_init_attrs(struct device_type *dev_type); > -extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env); > +extern int power_supply_uevent(const struct device *dev, struct kobj_uevent_env *env); > > #else > > diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c > index 5369abaceb5c..6ca7d3985a40 100644 > --- a/drivers/power/supply/power_supply_sysfs.c > +++ b/drivers/power/supply/power_supply_sysfs.c > @@ -427,7 +427,7 @@ void power_supply_init_attrs(struct device_type *dev_type) > } > } > > -static int add_prop_uevent(struct device *dev, struct kobj_uevent_env *env, > +static int add_prop_uevent(const struct device *dev, struct kobj_uevent_env *env, > enum power_supply_property prop, char *prop_buf) > { > int ret = 0; > @@ -438,7 +438,7 @@ static int add_prop_uevent(struct device *dev, struct kobj_uevent_env *env, > pwr_attr = &power_supply_attrs[prop]; > dev_attr = &pwr_attr->dev_attr; > > - ret = power_supply_show_property(dev, dev_attr, prop_buf); > + ret = power_supply_show_property((struct device *)dev, dev_attr, prop_buf); > if (ret == -ENODEV || ret == -ENODATA) { > /* > * When a battery is absent, we expect -ENODEV. Don't abort; > @@ -458,9 +458,9 @@ static int add_prop_uevent(struct device *dev, struct kobj_uevent_env *env, > pwr_attr->prop_name, prop_buf); > } > > -int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env) > +int power_supply_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct power_supply *psy = dev_get_drvdata(dev); > + const struct power_supply *psy = dev_get_drvdata(dev); > int ret = 0, j; > char *prop_buf; > > diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c > index c63c0c2cf649..b5994a0604f6 100644 > --- a/drivers/usb/gadget/udc/core.c > +++ b/drivers/usb/gadget/udc/core.c > @@ -1723,9 +1723,9 @@ static const struct attribute_group *usb_udc_attr_groups[] = { > NULL, > }; > > -static int usb_udc_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int usb_udc_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > - struct usb_udc *udc = container_of(dev, struct usb_udc, dev); > + const struct usb_udc *udc = container_of(dev, struct usb_udc, dev); > int ret; > > ret = add_uevent_var(env, "USB_UDC_NAME=%s", udc->gadget->name); > diff --git a/include/linux/device/class.h b/include/linux/device/class.h > index 20103e0b03c3..94b1107258e5 100644 > --- a/include/linux/device/class.h > +++ b/include/linux/device/class.h > @@ -59,7 +59,7 @@ struct class { > const struct attribute_group **dev_groups; > struct kobject *dev_kobj; > > - int (*dev_uevent)(struct device *dev, struct kobj_uevent_env *env); > + int (*dev_uevent)(const struct device *dev, struct kobj_uevent_env *env); > char *(*devnode)(struct device *dev, umode_t *mode); > > void (*class_release)(struct class *class); > diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h > index 7dd1f01ec4f9..7aab4a769736 100644 > --- a/include/linux/mISDNif.h > +++ b/include/linux/mISDNif.h > @@ -586,7 +586,7 @@ extern struct mISDNclock *mISDN_register_clock(char *, int, clockctl_func_t *, > void *); > extern void mISDN_unregister_clock(struct mISDNclock *); > > -static inline struct mISDNdevice *dev_to_mISDN(struct device *dev) > +static inline struct mISDNdevice *dev_to_mISDN(const struct device *dev) > { > if (dev) > return dev_get_drvdata(dev); > diff --git a/net/atm/atm_sysfs.c b/net/atm/atm_sysfs.c > index 0fdbdfd19474..466353b3dde4 100644 > --- a/net/atm/atm_sysfs.c > +++ b/net/atm/atm_sysfs.c > @@ -108,9 +108,9 @@ static struct device_attribute *atm_attrs[] = { > }; > > > -static int atm_uevent(struct device *cdev, struct kobj_uevent_env *env) > +static int atm_uevent(const struct device *cdev, struct kobj_uevent_env *env) > { > - struct atm_dev *adev; > + const struct atm_dev *adev; > > if (!cdev) > return -ENODEV; > diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c > index 9cfc80b8ed25..03a61d1dffbd 100644 > --- a/net/core/net-sysfs.c > +++ b/net/core/net-sysfs.c > @@ -1873,9 +1873,9 @@ const struct kobj_ns_type_operations net_ns_type_operations = { > }; > EXPORT_SYMBOL_GPL(net_ns_type_operations); > > -static int netdev_uevent(struct device *d, struct kobj_uevent_env *env) > +static int netdev_uevent(const struct device *d, struct kobj_uevent_env *env) > { > - struct net_device *dev = to_net_dev(d); > + const struct net_device *dev = to_net_dev(d); > int retval; > > /* pass interface to uevent. */ > diff --git a/net/rfkill/core.c b/net/rfkill/core.c > index dac4fdc7488a..b390ff245d5e 100644 > --- a/net/rfkill/core.c > +++ b/net/rfkill/core.c > @@ -832,7 +832,7 @@ static void rfkill_release(struct device *dev) > kfree(rfkill); > } > > -static int rfkill_dev_uevent(struct device *dev, struct kobj_uevent_env *env) > +static int rfkill_dev_uevent(const struct device *dev, struct kobj_uevent_env *env) > { > struct rfkill *rfkill = to_rfkill(dev); > unsigned long flags;
On 11/23/22 04:25, Greg Kroah-Hartman wrote: > diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h > index 7dd1f01ec4f9..7aab4a769736 100644 > --- a/include/linux/mISDNif.h > +++ b/include/linux/mISDNif.h > @@ -586,7 +586,7 @@ extern struct mISDNclock *mISDN_register_clock(char *, int, clockctl_func_t *, > void *); > extern void mISDN_unregister_clock(struct mISDNclock *); > > -static inline struct mISDNdevice *dev_to_mISDN(struct device *dev) > +static inline struct mISDNdevice *dev_to_mISDN(const struct device *dev) > { > if (dev) > return dev_get_drvdata(dev); Why does the dev_to_mISDN() function drop constness? I haven't found an explanation for this in the cover letter. Thanks, Bart.
On Fri, Nov 25, 2022 at 03:51:11PM -0800, Bart Van Assche wrote: > On 11/23/22 04:25, Greg Kroah-Hartman wrote: > > diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h > > index 7dd1f01ec4f9..7aab4a769736 100644 > > --- a/include/linux/mISDNif.h > > +++ b/include/linux/mISDNif.h > > @@ -586,7 +586,7 @@ extern struct mISDNclock *mISDN_register_clock(char *, int, clockctl_func_t *, > > void *); > > extern void mISDN_unregister_clock(struct mISDNclock *); > > -static inline struct mISDNdevice *dev_to_mISDN(struct device *dev) > > +static inline struct mISDNdevice *dev_to_mISDN(const struct device *dev) > > { > > if (dev) > > return dev_get_drvdata(dev); > > Why does the dev_to_mISDN() function drop constness? I haven't found an > explanation for this in the cover letter. I agree, this is going to be fixed up, see the thread starting here: https://lore.kernel.org/r/Y34+V2bCDdqujBDk@kroah.com I'll work on making a const / non const version for these so that we don't loose the marking. Oh wait, no, this function is fine, it's not modifying the device structure at all, and only returning the pointer in the private data stored in the device. There is no loss of const-ness here. thanks, greg k-h
On 11/27/22 05:45, Greg Kroah-Hartman wrote: > On Fri, Nov 25, 2022 at 03:51:11PM -0800, Bart Van Assche wrote: >> On 11/23/22 04:25, Greg Kroah-Hartman wrote: >>> diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h >>> index 7dd1f01ec4f9..7aab4a769736 100644 >>> --- a/include/linux/mISDNif.h >>> +++ b/include/linux/mISDNif.h >>> @@ -586,7 +586,7 @@ extern struct mISDNclock *mISDN_register_clock(char *, int, clockctl_func_t *, >>> void *); >>> extern void mISDN_unregister_clock(struct mISDNclock *); >>> -static inline struct mISDNdevice *dev_to_mISDN(struct device *dev) >>> +static inline struct mISDNdevice *dev_to_mISDN(const struct device *dev) >>> { >>> if (dev) >>> return dev_get_drvdata(dev); >> >> Why does the dev_to_mISDN() function drop constness? I haven't found an >> explanation for this in the cover letter. > > I agree, this is going to be fixed up, see the thread starting here: > https://lore.kernel.org/r/Y34+V2bCDdqujBDk@kroah.com > > I'll work on making a const / non const version for these so that we > don't loose the marking. > > Oh wait, no, this function is fine, it's not modifying the device > structure at all, and only returning the pointer in the private data > stored in the device. There is no loss of const-ness here. Hi Greg, This is what I found in include/linux/mISDNif.h: struct mISDNdevice { struct mISDNchannel D; u_int id; u_int Dprotocols; u_int Bprotocols; u_int nrbchan; u_char channelmap[MISDN_CHMAP_SIZE]; struct list_head bchannels; struct mISDNchannel *teimgr; struct device dev; }; As one can see 'dev' is a member of struct mISDNdevice. I still think that dev_to_mISDN() drops constness. Did I perhaps overlook something? Bart.
On Sun, Nov 27, 2022 at 06:38:39PM -0800, Bart Van Assche wrote: > On 11/27/22 05:45, Greg Kroah-Hartman wrote: > > On Fri, Nov 25, 2022 at 03:51:11PM -0800, Bart Van Assche wrote: > > > On 11/23/22 04:25, Greg Kroah-Hartman wrote: > > > > diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h > > > > index 7dd1f01ec4f9..7aab4a769736 100644 > > > > --- a/include/linux/mISDNif.h > > > > +++ b/include/linux/mISDNif.h > > > > @@ -586,7 +586,7 @@ extern struct mISDNclock *mISDN_register_clock(char *, int, clockctl_func_t *, > > > > void *); > > > > extern void mISDN_unregister_clock(struct mISDNclock *); > > > > -static inline struct mISDNdevice *dev_to_mISDN(struct device *dev) > > > > +static inline struct mISDNdevice *dev_to_mISDN(const struct device *dev) > > > > { > > > > if (dev) > > > > return dev_get_drvdata(dev); > > > > > > Why does the dev_to_mISDN() function drop constness? I haven't found an > > > explanation for this in the cover letter. > > > > I agree, this is going to be fixed up, see the thread starting here: > > https://lore.kernel.org/r/Y34+V2bCDdqujBDk@kroah.com > > > > I'll work on making a const / non const version for these so that we > > don't loose the marking. > > > > Oh wait, no, this function is fine, it's not modifying the device > > structure at all, and only returning the pointer in the private data > > stored in the device. There is no loss of const-ness here. > > Hi Greg, > > This is what I found in include/linux/mISDNif.h: > > struct mISDNdevice { > struct mISDNchannel D; > u_int id; > u_int Dprotocols; > u_int Bprotocols; > u_int nrbchan; > u_char channelmap[MISDN_CHMAP_SIZE]; > struct list_head bchannels; > struct mISDNchannel *teimgr; > struct device dev; > }; > > As one can see 'dev' is a member of struct mISDNdevice. I still think that > dev_to_mISDN() drops constness. Did I perhaps overlook something? I think you are missing that dev_to_mISDN() is doing something different than most dev_to_FOO() functions do (i.e. there is no container_of() call here at all): static inline struct mISDNdevice *dev_to_mISDN(struct device *dev) { if (dev) return dev_get_drvdata(dev); else return NULL; } See, no pointer mess or anything else here, all that happens is the driver data pointer in struct device is returned. If this was a "normal" dev_to_FOO() function, then yes, the const-ness of the pointer would be called into question as the thread I linked to discusses. thanks, greg k-h
diff --git a/block/genhd.c b/block/genhd.c index 0f9769db2de8..3f1124713442 100644 --- a/block/genhd.c +++ b/block/genhd.c @@ -1181,9 +1181,9 @@ static void disk_release(struct device *dev) iput(disk->part0->bd_inode); /* frees the disk */ } -static int block_uevent(struct device *dev, struct kobj_uevent_env *env) +static int block_uevent(const struct device *dev, struct kobj_uevent_env *env) { - struct gendisk *disk = dev_to_disk(dev); + const struct gendisk *disk = dev_to_disk(dev); return add_uevent_var(env, "DISKSEQ=%llu", disk->diskseq); } diff --git a/drivers/base/firmware_loader/sysfs.c b/drivers/base/firmware_loader/sysfs.c index 5b66b3d1fa16..56911d75b90a 100644 --- a/drivers/base/firmware_loader/sysfs.c +++ b/drivers/base/firmware_loader/sysfs.c @@ -64,7 +64,7 @@ static struct attribute *firmware_class_attrs[] = { }; ATTRIBUTE_GROUPS(firmware_class); -static int do_firmware_uevent(struct fw_sysfs *fw_sysfs, struct kobj_uevent_env *env) +static int do_firmware_uevent(const struct fw_sysfs *fw_sysfs, struct kobj_uevent_env *env) { if (add_uevent_var(env, "FIRMWARE=%s", fw_sysfs->fw_priv->fw_name)) return -ENOMEM; @@ -76,9 +76,9 @@ static int do_firmware_uevent(struct fw_sysfs *fw_sysfs, struct kobj_uevent_env return 0; } -static int firmware_uevent(struct device *dev, struct kobj_uevent_env *env) +static int firmware_uevent(const struct device *dev, struct kobj_uevent_env *env) { - struct fw_sysfs *fw_sysfs = to_fw_sysfs(dev); + const struct fw_sysfs *fw_sysfs = to_fw_sysfs(dev); int err = 0; mutex_lock(&fw_lock); diff --git a/drivers/base/firmware_loader/sysfs.h b/drivers/base/firmware_loader/sysfs.h index df1d5add698f..fd0b4ad9bdbb 100644 --- a/drivers/base/firmware_loader/sysfs.h +++ b/drivers/base/firmware_loader/sysfs.h @@ -81,7 +81,7 @@ struct fw_sysfs { void *fw_upload_priv; }; -static inline struct fw_sysfs *to_fw_sysfs(struct device *dev) +static inline struct fw_sysfs *to_fw_sysfs(const struct device *dev) { return container_of(dev, struct fw_sysfs, dev); } diff --git a/drivers/firmware/dmi-id.c b/drivers/firmware/dmi-id.c index 940ddf916202..5f3a3e913d28 100644 --- a/drivers/firmware/dmi-id.c +++ b/drivers/firmware/dmi-id.c @@ -155,7 +155,7 @@ static const struct attribute_group* sys_dmi_attribute_groups[] = { NULL }; -static int dmi_dev_uevent(struct device *dev, struct kobj_uevent_env *env) +static int dmi_dev_uevent(const struct device *dev, struct kobj_uevent_env *env) { ssize_t len; diff --git a/drivers/gnss/core.c b/drivers/gnss/core.c index 1e82b7967570..77a4b280c552 100644 --- a/drivers/gnss/core.c +++ b/drivers/gnss/core.c @@ -337,7 +337,7 @@ static const char * const gnss_type_names[GNSS_TYPE_COUNT] = { [GNSS_TYPE_MTK] = "MTK", }; -static const char *gnss_type_name(struct gnss_device *gdev) +static const char *gnss_type_name(const struct gnss_device *gdev) { const char *name = NULL; @@ -365,9 +365,9 @@ static struct attribute *gnss_attrs[] = { }; ATTRIBUTE_GROUPS(gnss); -static int gnss_uevent(struct device *dev, struct kobj_uevent_env *env) +static int gnss_uevent(const struct device *dev, struct kobj_uevent_env *env) { - struct gnss_device *gdev = to_gnss_device(dev); + const struct gnss_device *gdev = to_gnss_device(dev); int ret; ret = add_uevent_var(env, "GNSS_TYPE=%s", gnss_type_name(gdev)); diff --git a/drivers/infiniband/core/device.c b/drivers/infiniband/core/device.c index fa65c5d3d395..4186dbf9377f 100644 --- a/drivers/infiniband/core/device.c +++ b/drivers/infiniband/core/device.c @@ -511,7 +511,7 @@ static void ib_device_release(struct device *device) kfree_rcu(dev, rcu_head); } -static int ib_device_uevent(struct device *device, +static int ib_device_uevent(const struct device *device, struct kobj_uevent_env *env) { if (add_uevent_var(env, "NAME=%s", dev_name(device))) diff --git a/drivers/isdn/mISDN/core.c b/drivers/isdn/mISDN/core.c index 90ee56d07a6e..9120be590325 100644 --- a/drivers/isdn/mISDN/core.c +++ b/drivers/isdn/mISDN/core.c @@ -139,9 +139,9 @@ static struct attribute *mISDN_attrs[] = { }; ATTRIBUTE_GROUPS(mISDN); -static int mISDN_uevent(struct device *dev, struct kobj_uevent_env *env) +static int mISDN_uevent(const struct device *dev, struct kobj_uevent_env *env) { - struct mISDNdevice *mdev = dev_to_mISDN(dev); + const struct mISDNdevice *mdev = dev_to_mISDN(dev); if (!mdev) return 0; diff --git a/drivers/media/dvb-core/dvbdev.c b/drivers/media/dvb-core/dvbdev.c index 675d877a67b2..6ef18bab9648 100644 --- a/drivers/media/dvb-core/dvbdev.c +++ b/drivers/media/dvb-core/dvbdev.c @@ -1008,9 +1008,9 @@ void dvb_module_release(struct i2c_client *client) EXPORT_SYMBOL_GPL(dvb_module_release); #endif -static int dvb_uevent(struct device *dev, struct kobj_uevent_env *env) +static int dvb_uevent(const struct device *dev, struct kobj_uevent_env *env) { - struct dvb_device *dvbdev = dev_get_drvdata(dev); + const struct dvb_device *dvbdev = dev_get_drvdata(dev); add_uevent_var(env, "DVB_ADAPTER_NUM=%d", dvbdev->adapter->num); add_uevent_var(env, "DVB_DEVICE_TYPE=%s", dnames[dvbdev->type]); diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c index da55ce45ac70..b4778b970dd4 100644 --- a/drivers/nvme/host/core.c +++ b/drivers/nvme/host/core.c @@ -4580,9 +4580,9 @@ void nvme_remove_namespaces(struct nvme_ctrl *ctrl) } EXPORT_SYMBOL_GPL(nvme_remove_namespaces); -static int nvme_class_uevent(struct device *dev, struct kobj_uevent_env *env) +static int nvme_class_uevent(const struct device *dev, struct kobj_uevent_env *env) { - struct nvme_ctrl *ctrl = + const struct nvme_ctrl *ctrl = container_of(dev, struct nvme_ctrl, ctrl_device); struct nvmf_ctrl_options *opts = ctrl->opts; int ret; diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c index f70197154a36..e3224e49c43f 100644 --- a/drivers/pcmcia/cs.c +++ b/drivers/pcmcia/cs.c @@ -810,10 +810,10 @@ int pcmcia_reset_card(struct pcmcia_socket *skt) EXPORT_SYMBOL(pcmcia_reset_card); -static int pcmcia_socket_uevent(struct device *dev, +static int pcmcia_socket_uevent(const struct device *dev, struct kobj_uevent_env *env) { - struct pcmcia_socket *s = container_of(dev, struct pcmcia_socket, dev); + const struct pcmcia_socket *s = container_of(dev, struct pcmcia_socket, dev); if (add_uevent_var(env, "SOCKET_NO=%u", s->sock)) return -ENOMEM; diff --git a/drivers/power/supply/power_supply.h b/drivers/power/supply/power_supply.h index c310d4f36c10..645eee4d6b6a 100644 --- a/drivers/power/supply/power_supply.h +++ b/drivers/power/supply/power_supply.h @@ -16,7 +16,7 @@ struct power_supply; #ifdef CONFIG_SYSFS extern void power_supply_init_attrs(struct device_type *dev_type); -extern int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env); +extern int power_supply_uevent(const struct device *dev, struct kobj_uevent_env *env); #else diff --git a/drivers/power/supply/power_supply_sysfs.c b/drivers/power/supply/power_supply_sysfs.c index 5369abaceb5c..6ca7d3985a40 100644 --- a/drivers/power/supply/power_supply_sysfs.c +++ b/drivers/power/supply/power_supply_sysfs.c @@ -427,7 +427,7 @@ void power_supply_init_attrs(struct device_type *dev_type) } } -static int add_prop_uevent(struct device *dev, struct kobj_uevent_env *env, +static int add_prop_uevent(const struct device *dev, struct kobj_uevent_env *env, enum power_supply_property prop, char *prop_buf) { int ret = 0; @@ -438,7 +438,7 @@ static int add_prop_uevent(struct device *dev, struct kobj_uevent_env *env, pwr_attr = &power_supply_attrs[prop]; dev_attr = &pwr_attr->dev_attr; - ret = power_supply_show_property(dev, dev_attr, prop_buf); + ret = power_supply_show_property((struct device *)dev, dev_attr, prop_buf); if (ret == -ENODEV || ret == -ENODATA) { /* * When a battery is absent, we expect -ENODEV. Don't abort; @@ -458,9 +458,9 @@ static int add_prop_uevent(struct device *dev, struct kobj_uevent_env *env, pwr_attr->prop_name, prop_buf); } -int power_supply_uevent(struct device *dev, struct kobj_uevent_env *env) +int power_supply_uevent(const struct device *dev, struct kobj_uevent_env *env) { - struct power_supply *psy = dev_get_drvdata(dev); + const struct power_supply *psy = dev_get_drvdata(dev); int ret = 0, j; char *prop_buf; diff --git a/drivers/usb/gadget/udc/core.c b/drivers/usb/gadget/udc/core.c index c63c0c2cf649..b5994a0604f6 100644 --- a/drivers/usb/gadget/udc/core.c +++ b/drivers/usb/gadget/udc/core.c @@ -1723,9 +1723,9 @@ static const struct attribute_group *usb_udc_attr_groups[] = { NULL, }; -static int usb_udc_uevent(struct device *dev, struct kobj_uevent_env *env) +static int usb_udc_uevent(const struct device *dev, struct kobj_uevent_env *env) { - struct usb_udc *udc = container_of(dev, struct usb_udc, dev); + const struct usb_udc *udc = container_of(dev, struct usb_udc, dev); int ret; ret = add_uevent_var(env, "USB_UDC_NAME=%s", udc->gadget->name); diff --git a/include/linux/device/class.h b/include/linux/device/class.h index 20103e0b03c3..94b1107258e5 100644 --- a/include/linux/device/class.h +++ b/include/linux/device/class.h @@ -59,7 +59,7 @@ struct class { const struct attribute_group **dev_groups; struct kobject *dev_kobj; - int (*dev_uevent)(struct device *dev, struct kobj_uevent_env *env); + int (*dev_uevent)(const struct device *dev, struct kobj_uevent_env *env); char *(*devnode)(struct device *dev, umode_t *mode); void (*class_release)(struct class *class); diff --git a/include/linux/mISDNif.h b/include/linux/mISDNif.h index 7dd1f01ec4f9..7aab4a769736 100644 --- a/include/linux/mISDNif.h +++ b/include/linux/mISDNif.h @@ -586,7 +586,7 @@ extern struct mISDNclock *mISDN_register_clock(char *, int, clockctl_func_t *, void *); extern void mISDN_unregister_clock(struct mISDNclock *); -static inline struct mISDNdevice *dev_to_mISDN(struct device *dev) +static inline struct mISDNdevice *dev_to_mISDN(const struct device *dev) { if (dev) return dev_get_drvdata(dev); diff --git a/net/atm/atm_sysfs.c b/net/atm/atm_sysfs.c index 0fdbdfd19474..466353b3dde4 100644 --- a/net/atm/atm_sysfs.c +++ b/net/atm/atm_sysfs.c @@ -108,9 +108,9 @@ static struct device_attribute *atm_attrs[] = { }; -static int atm_uevent(struct device *cdev, struct kobj_uevent_env *env) +static int atm_uevent(const struct device *cdev, struct kobj_uevent_env *env) { - struct atm_dev *adev; + const struct atm_dev *adev; if (!cdev) return -ENODEV; diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index 9cfc80b8ed25..03a61d1dffbd 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -1873,9 +1873,9 @@ const struct kobj_ns_type_operations net_ns_type_operations = { }; EXPORT_SYMBOL_GPL(net_ns_type_operations); -static int netdev_uevent(struct device *d, struct kobj_uevent_env *env) +static int netdev_uevent(const struct device *d, struct kobj_uevent_env *env) { - struct net_device *dev = to_net_dev(d); + const struct net_device *dev = to_net_dev(d); int retval; /* pass interface to uevent. */ diff --git a/net/rfkill/core.c b/net/rfkill/core.c index dac4fdc7488a..b390ff245d5e 100644 --- a/net/rfkill/core.c +++ b/net/rfkill/core.c @@ -832,7 +832,7 @@ static void rfkill_release(struct device *dev) kfree(rfkill); } -static int rfkill_dev_uevent(struct device *dev, struct kobj_uevent_env *env) +static int rfkill_dev_uevent(const struct device *dev, struct kobj_uevent_env *env) { struct rfkill *rfkill = to_rfkill(dev); unsigned long flags;
The dev_uevent() in struct class should not be modifying the device that is passed into it, so mark it as a const * and propagate the function signature changes out into all relevant subsystems that use this callback. Cc: Jens Axboe <axboe@kernel.dk> Cc: Luis Chamberlain <mcgrof@kernel.org> Cc: Russ Weight <russell.h.weight@intel.com> Cc: "Rafael J. Wysocki" <rafael@kernel.org> Cc: Jean Delvare <jdelvare@suse.com> Cc: Johan Hovold <johan@kernel.org> Cc: Jason Gunthorpe <jgg@ziepe.ca> Cc: Leon Romanovsky <leon@kernel.org> Cc: Karsten Keil <isdn@linux-pingi.de> Cc: Mauro Carvalho Chehab <mchehab@kernel.org> Cc: Keith Busch <kbusch@kernel.org> Cc: Christoph Hellwig <hch@lst.de> Cc: Sagi Grimberg <sagi@grimberg.me> Cc: Dominik Brodowski <linux@dominikbrodowski.net> Cc: Sebastian Reichel <sre@kernel.org> 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: Johannes Berg <johannes@sipsolutions.net> Cc: Wolfram Sang <wsa+renesas@sang-engineering.com> Cc: Raed Salem <raeds@nvidia.com> Cc: Chen Zhongjin <chenzhongjin@huawei.com> Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> Cc: Avihai Horon <avihaih@nvidia.com> Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org> Cc: Alan Stern <stern@rowland.harvard.edu> Cc: Colin Ian King <colin.i.king@gmail.com> Cc: Geert Uytterhoeven <geert+renesas@glider.be> Cc: Jakob Koschel <jakobkoschel@gmail.com> Cc: Antoine Tenart <atenart@kernel.org> Cc: Frederic Weisbecker <frederic@kernel.org> Cc: Wang Yufen <wangyufen@huawei.com> Cc: linux-block@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: linux-media@vger.kernel.org Cc: linux-nvme@lists.infradead.org Cc: linux-pm@vger.kernel.org Cc: linux-rdma@vger.kernel.org Cc: linux-usb@vger.kernel.org Cc: linux-wireless@vger.kernel.org Cc: netdev@vger.kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- block/genhd.c | 4 ++-- drivers/base/firmware_loader/sysfs.c | 6 +++--- drivers/base/firmware_loader/sysfs.h | 2 +- drivers/firmware/dmi-id.c | 2 +- drivers/gnss/core.c | 6 +++--- drivers/infiniband/core/device.c | 2 +- drivers/isdn/mISDN/core.c | 4 ++-- drivers/media/dvb-core/dvbdev.c | 4 ++-- drivers/nvme/host/core.c | 4 ++-- drivers/pcmcia/cs.c | 4 ++-- drivers/power/supply/power_supply.h | 2 +- drivers/power/supply/power_supply_sysfs.c | 8 ++++---- drivers/usb/gadget/udc/core.c | 4 ++-- include/linux/device/class.h | 2 +- include/linux/mISDNif.h | 2 +- net/atm/atm_sysfs.c | 4 ++-- net/core/net-sysfs.c | 4 ++-- net/rfkill/core.c | 2 +- 18 files changed, 33 insertions(+), 33 deletions(-)