Commit ff985c75 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

auxbus: make to_auxiliary_drv accept and return a constant pointer 



In the quest to make struct device constant, start by making
to_auxiliary_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: Dave Ertman <david.m.ertman@intel.com>
Cc: Ira Weiny <ira.weiny@intel.com>
Cc: Rafael J. Wysocki <rafael@kernel.org>
Cc: Bingbu Cao <bingbu.cao@intel.com>
Cc: Tianshu Qiu <tian.shu.qiu@intel.com>
Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: Michael Chan <michael.chan@broadcom.com>
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: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: Saeed Mahameed <saeedm@nvidia.com>
Cc: Leon Romanovsky <leon@kernel.org>
Cc: Tariq Toukan <tariqt@nvidia.com>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Liam Girdwood <lgirdwood@gmail.com>
Cc: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
Cc: Bard Liao <yung-chuan.liao@linux.intel.com>
Cc: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Cc: Daniel Baluta <daniel.baluta@nxp.com>
Cc: Kai Vehmanen <kai.vehmanen@linux.intel.com>
Cc: Jaroslav Kysela <perex@perex.cz>
Cc: Takashi Iwai <tiwai@suse.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: linux-media@vger.kernel.org
Cc: netdev@vger.kernel.org
Cc: intel-wired-lan@lists.osuosl.org
Cc: linux-rdma@vger.kernel.org
Cc: sound-open-firmware@alsa-project.org
Cc: linux-sound@vger.kernel.org
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com> # drivers/media/pci/intel/ipu6
Acked-by: default avatarMark Brown <broonie@kernel.org>
Reviewed-by: default avatarMartin Habets <habetsm.xilinx@gmail.com>
Link: https://lore.kernel.org/r/20240611130103.3262749-7-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 477e3654

drivers/base/auxiliary.c

+4 −4
Original line number Diff line number Diff line
@@ -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) {

drivers/media/pci/intel/ipu6/ipu6-bus.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

drivers/net/ethernet/intel/ice/ice_ptp.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

drivers/net/ethernet/mellanox/mlx5/core/dev.c

+2 −2
Original line number Diff line number Diff line
@@ -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;