Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 92ce7e83 authored by Suzuki K Poulose's avatar Suzuki K Poulose Committed by Greg Kroah-Hartman
Browse files

driver_find_device: Unify the match function with class_find_device() 



The driver_find_device() accepts a match function pointer to
filter the devices for lookup, similar to bus/class_find_device().
However, there is a minor difference in the prototype for the
match parameter for driver_find_device() with the now unified
version accepted by {bus/class}_find_device(), where it doesn't
accept a "const" qualifier for the data argument. This prevents
us from reusing the generic match functions for driver_find_device().

For this reason, change the prototype of the driver_find_device() to
make the "match" parameter in line with {bus/class}_find_device()
and adjust its callers to use the const qualifier. Also, we could
now promote the "data" parameter to const as we pass it down
as a const parameter to the match functions.

Cc: Corey Minyard <minyard@acm.org>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Peter Oberparleiter <oberpar@linux.ibm.com>
Cc: Sebastian Ott <sebott@linux.ibm.com>
Cc: David Airlie <airlied@linux.ie>
Cc: Daniel Vetter <daniel@ffwll.ch>
Cc: Nehal Shah <nehal-bakulchandra.shah@amd.com>
Cc: Shyam Sundar S K <shyam-sundar.s-k@amd.com>
Cc: Lee Jones <lee.jones@linaro.org>
Cc: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 418e3ea1

drivers/amba/tegra-ahb.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -143,10 +143,10 @@ static inline void gizmo_writel(struct tegra_ahb *ahb, u32 value, u32 offset) 
}

}





#ifdef CONFIG_TEGRA_IOMMU_SMMU

#ifdef CONFIG_TEGRA_IOMMU_SMMU

static int tegra_ahb_match_by_smmu(struct device *dev, void *data)

static int tegra_ahb_match_by_smmu(struct device *dev, const void *data)

{

{

	struct tegra_ahb *ahb = dev_get_drvdata(dev);

	struct tegra_ahb *ahb = dev_get_drvdata(dev);

	struct device_node *dn = data;

	const struct device_node *dn = data;





	return (ahb->dev->of_node == dn) ? 1 : 0;

	return (ahb->dev->of_node == dn) ? 1 : 0;

}

}

drivers/base/driver.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -73,8 +73,8 @@ EXPORT_SYMBOL_GPL(driver_for_each_device); 
 * return to the caller and not iterate over any more devices.

 * return to the caller and not iterate over any more devices.

 */

 */

struct device *driver_find_device(struct device_driver *drv,

struct device *driver_find_device(struct device_driver *drv,

				  struct device *start, void *data,

				  struct device *start, const void *data,

				  int (*match)(struct device *dev, void *data))

				  int (*match)(struct device *dev, const void *data))

{

{

	struct klist_iter i;

	struct klist_iter i;

	struct device *dev;

	struct device *dev;

drivers/char/ipmi/ipmi_msghandler.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -2819,9 +2819,9 @@ static const struct device_type bmc_device_type = { 
	.groups		= bmc_dev_attr_groups,

	.groups		= bmc_dev_attr_groups,

};

};





static int __find_bmc_guid(struct device *dev, void *data)

static int __find_bmc_guid(struct device *dev, const void *data)

{

{

	guid_t *guid = data;

	const guid_t *guid = data;

	struct bmc_device *bmc;

	struct bmc_device *bmc;

	int rv;

	int rv;
@@ -2857,9 +2857,9 @@ struct prod_dev_id { 
	unsigned char device_id;

	unsigned char device_id;

};

};





static int __find_bmc_prod_dev_id(struct device *dev, void *data)

static int __find_bmc_prod_dev_id(struct device *dev, const void *data)

{

{

	struct prod_dev_id *cid = data;

	const struct prod_dev_id *cid = data;

	struct bmc_device *bmc;

	struct bmc_device *bmc;

	int rv;

	int rv;

drivers/gpu/drm/tegra/dc.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2375,10 +2375,10 @@ static int tegra_dc_parse_dt(struct tegra_dc *dc) 
	return 0;

	return 0;

}

}





static int tegra_dc_match_by_pipe(struct device *dev, void *data)

static int tegra_dc_match_by_pipe(struct device *dev, const void *data)

{

{

	struct tegra_dc *dc = dev_get_drvdata(dev);

	struct tegra_dc *dc = dev_get_drvdata(dev);

	unsigned int pipe = (unsigned long)data;

	unsigned int pipe = (unsigned long)(void *)data;





	return dc->pipe == pipe;

	return dc->pipe == pipe;

}

}

drivers/i2c/busses/i2c-amd-mp2-pci.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -457,7 +457,7 @@ static struct pci_driver amd_mp2_pci_driver = { 
};

};

module_pci_driver(amd_mp2_pci_driver);

module_pci_driver(amd_mp2_pci_driver);





static int amd_mp2_device_match(struct device *dev, void *data)

static int amd_mp2_device_match(struct device *dev, const void *data)

{

{

	return 1;

	return 1;

}

}