On Tue, Jun 11, 2024 at 03:01:04PM +0200, Greg Kroah-Hartman wrote: > In the quest to make struct device constant, start by making > to_auziliary_drv() return a constant pointer so that drivers that call > this can be fixed up before the driver core changes. > > As the return type previously was not constant, also fix up all callers > that were assuming that the pointer was not going to be a constant one > in order to not break the build. > > Cc: Greg Kroah-Hartman <[email protected]> > Cc: Dave Ertman <[email protected]> > Cc: Ira Weiny <[email protected]> > Cc: "Rafael J. Wysocki" <[email protected]> > Cc: Sakari Ailus <[email protected]> > Cc: Bingbu Cao <[email protected]> > Cc: Tianshu Qiu <[email protected]> > Cc: Mauro Carvalho Chehab <[email protected]> > Cc: Michael Chan <[email protected]> > Cc: "David S. Miller" <[email protected]> > Cc: Eric Dumazet <[email protected]> > Cc: Jakub Kicinski <[email protected]> > Cc: Paolo Abeni <[email protected]> > Cc: Jesse Brandeburg <[email protected]> > Cc: Tony Nguyen <[email protected]> > Cc: Saeed Mahameed <[email protected]> > Cc: Leon Romanovsky <[email protected]> > Cc: Tariq Toukan <[email protected]> > Cc: Pierre-Louis Bossart <[email protected]> > Cc: Liam Girdwood <[email protected]> > Cc: Peter Ujfalusi <[email protected]> > Cc: Bard Liao <[email protected]> > Cc: Ranjani Sridharan <[email protected]> > Cc: Daniel Baluta <[email protected]> > Cc: Kai Vehmanen <[email protected]> > Cc: Mark Brown <[email protected]> > Cc: Jaroslav Kysela <[email protected]> > Cc: Takashi Iwai <[email protected]> > Cc: Richard Cochran <[email protected]> > Cc: [email protected] > Cc: [email protected] > Cc: [email protected] > Cc: [email protected] > Cc: [email protected] > Cc: [email protected] > Signed-off-by: Greg Kroah-Hartman <[email protected]>
Reviewed-by: Martin Habets <[email protected]> > --- > drivers/base/auxiliary.c | 8 ++++---- > drivers/media/pci/intel/ipu6/ipu6-bus.h | 2 +- > drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 4 ++-- > drivers/net/ethernet/intel/ice/ice_ptp.c | 2 +- > drivers/net/ethernet/mellanox/mlx5/core/dev.c | 4 ++-- > include/linux/auxiliary_bus.h | 2 +- > sound/soc/sof/sof-client.c | 4 ++-- > 7 files changed, 13 insertions(+), 13 deletions(-) > > diff --git a/drivers/base/auxiliary.c b/drivers/base/auxiliary.c > index d3a2c40c2f12..5832e31bb77b 100644 > --- a/drivers/base/auxiliary.c > +++ b/drivers/base/auxiliary.c > @@ -180,7 +180,7 @@ static const struct auxiliary_device_id > *auxiliary_match_id(const struct auxilia > static int auxiliary_match(struct device *dev, struct device_driver *drv) > { > struct auxiliary_device *auxdev = to_auxiliary_dev(dev); > - struct auxiliary_driver *auxdrv = to_auxiliary_drv(drv); > + const struct auxiliary_driver *auxdrv = to_auxiliary_drv(drv); > > return !!auxiliary_match_id(auxdrv->id_table, auxdev); > } > @@ -203,7 +203,7 @@ static const struct dev_pm_ops auxiliary_dev_pm_ops = { > > static int auxiliary_bus_probe(struct device *dev) > { > - struct auxiliary_driver *auxdrv = to_auxiliary_drv(dev->driver); > + const struct auxiliary_driver *auxdrv = to_auxiliary_drv(dev->driver); > struct auxiliary_device *auxdev = to_auxiliary_dev(dev); > int ret; > > @@ -222,7 +222,7 @@ static int auxiliary_bus_probe(struct device *dev) > > static void auxiliary_bus_remove(struct device *dev) > { > - struct auxiliary_driver *auxdrv = to_auxiliary_drv(dev->driver); > + const struct auxiliary_driver *auxdrv = to_auxiliary_drv(dev->driver); > struct auxiliary_device *auxdev = to_auxiliary_dev(dev); > > if (auxdrv->remove) > @@ -232,7 +232,7 @@ static void auxiliary_bus_remove(struct device *dev) > > static void auxiliary_bus_shutdown(struct device *dev) > { > - struct auxiliary_driver *auxdrv = NULL; > + const struct auxiliary_driver *auxdrv = NULL; > struct auxiliary_device *auxdev; > > if (dev->driver) { > diff --git a/drivers/media/pci/intel/ipu6/ipu6-bus.h > b/drivers/media/pci/intel/ipu6/ipu6-bus.h > index b26c6aee1621..bb4926dfdf08 100644 > --- a/drivers/media/pci/intel/ipu6/ipu6-bus.h > +++ b/drivers/media/pci/intel/ipu6/ipu6-bus.h > @@ -21,7 +21,7 @@ struct ipu6_buttress_ctrl; > > struct ipu6_bus_device { > struct auxiliary_device auxdev; > - struct auxiliary_driver *auxdrv; > + const struct auxiliary_driver *auxdrv; > const struct ipu6_auxdrv_data *auxdrv_data; > struct list_head list; > void *pdata; > diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c > b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c > index ba3fa1c2e5d9..b9e7d3e7b15d 100644 > --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c > +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c > @@ -239,7 +239,7 @@ void bnxt_ulp_stop(struct bnxt *bp) > > adev = &aux_priv->aux_dev; > if (adev->dev.driver) { > - struct auxiliary_driver *adrv; > + const struct auxiliary_driver *adrv; > pm_message_t pm = {}; > > adrv = to_auxiliary_drv(adev->dev.driver); > @@ -277,7 +277,7 @@ void bnxt_ulp_start(struct bnxt *bp, int err) > > adev = &aux_priv->aux_dev; > if (adev->dev.driver) { > - struct auxiliary_driver *adrv; > + const struct auxiliary_driver *adrv; > > adrv = to_auxiliary_drv(adev->dev.driver); > edev->en_state = bp->state; > diff --git a/drivers/net/ethernet/intel/ice/ice_ptp.c > b/drivers/net/ethernet/intel/ice/ice_ptp.c > index 0f17fc1181d2..7341e7c4ef24 100644 > --- a/drivers/net/ethernet/intel/ice/ice_ptp.c > +++ b/drivers/net/ethernet/intel/ice/ice_ptp.c > @@ -2784,7 +2784,7 @@ static struct ice_pf * > ice_ptp_aux_dev_to_owner_pf(struct auxiliary_device *aux_dev) > { > struct ice_ptp_port_owner *ports_owner; > - struct auxiliary_driver *aux_drv; > + const struct auxiliary_driver *aux_drv; > struct ice_ptp *owner_ptp; > > if (!aux_dev->dev.driver) > diff --git a/drivers/net/ethernet/mellanox/mlx5/core/dev.c > b/drivers/net/ethernet/mellanox/mlx5/core/dev.c > index 47e7c2639774..9a79674d27f1 100644 > --- a/drivers/net/ethernet/mellanox/mlx5/core/dev.c > +++ b/drivers/net/ethernet/mellanox/mlx5/core/dev.c > @@ -349,7 +349,7 @@ int mlx5_attach_device(struct mlx5_core_dev *dev) > { > struct mlx5_priv *priv = &dev->priv; > struct auxiliary_device *adev; > - struct auxiliary_driver *adrv; > + const struct auxiliary_driver *adrv; > int ret = 0, i; > > devl_assert_locked(priv_to_devlink(dev)); > @@ -406,7 +406,7 @@ void mlx5_detach_device(struct mlx5_core_dev *dev, bool > suspend) > { > struct mlx5_priv *priv = &dev->priv; > struct auxiliary_device *adev; > - struct auxiliary_driver *adrv; > + const struct auxiliary_driver *adrv; > pm_message_t pm = {}; > int i; > > diff --git a/include/linux/auxiliary_bus.h b/include/linux/auxiliary_bus.h > index de21d9d24a95..bdff7b85f2ae 100644 > --- a/include/linux/auxiliary_bus.h > +++ b/include/linux/auxiliary_bus.h > @@ -203,7 +203,7 @@ static inline struct auxiliary_device > *to_auxiliary_dev(struct device *dev) > return container_of(dev, struct auxiliary_device, dev); > } > > -static inline struct auxiliary_driver *to_auxiliary_drv(struct device_driver > *drv) > +static inline const struct auxiliary_driver *to_auxiliary_drv(const struct > device_driver *drv) > { > return container_of(drv, struct auxiliary_driver, driver); > } > diff --git a/sound/soc/sof/sof-client.c b/sound/soc/sof/sof-client.c > index 99f74def4ab6..5d6005a88e79 100644 > --- a/sound/soc/sof/sof-client.c > +++ b/sound/soc/sof/sof-client.c > @@ -357,7 +357,7 @@ EXPORT_SYMBOL_NS_GPL(sof_client_ipc4_find_module, > SND_SOC_SOF_CLIENT); > > int sof_suspend_clients(struct snd_sof_dev *sdev, pm_message_t state) > { > - struct auxiliary_driver *adrv; > + const struct auxiliary_driver *adrv; > struct sof_client_dev *cdev; > > mutex_lock(&sdev->ipc_client_mutex); > @@ -380,7 +380,7 @@ EXPORT_SYMBOL_NS_GPL(sof_suspend_clients, > SND_SOC_SOF_CLIENT); > > int sof_resume_clients(struct snd_sof_dev *sdev) > { > - struct auxiliary_driver *adrv; > + const struct auxiliary_driver *adrv; > struct sof_client_dev *cdev; > > mutex_lock(&sdev->ipc_client_mutex); > -- > 2.45.2 >
