mirrors/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2025-11-04 10:40:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

driver_find_device: Unify the match function with class_find_device()

Browse source 
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: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Suzuki K Poulose 2019-06-14 18:54:00 +01:00 committed by Greg Kroah-Hartman
parent 418e3ea157
commit 92ce7e83b4
12 changed files with 21 additions and 21 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/amba/tegra-ahb.c
View file

@ -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;
} }

4
drivers/base/driver.c
View file

@ -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;

8
drivers/char/ipmi/ipmi_msghandler.c
View file

@ -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;

4
drivers/gpu/drm/tegra/dc.c
View file

@ -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;
} }

2
drivers/i2c/busses/i2c-amd-mp2-pci.c
View file

@ -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;
} }

2
drivers/iommu/arm-smmu-v3.c
View file

@ -2023,7 +2023,7 @@ arm_smmu_iova_to_phys(struct iommu_domain *domain, dma_addr_t iova)
static struct platform_driver arm_smmu_driver; static struct platform_driver arm_smmu_driver;
static int arm_smmu_match_node(struct device *dev, void *data) static int arm_smmu_match_node(struct device *dev, const void *data)
{ {
return dev->fwnode == data; return dev->fwnode == data;
} }

2
drivers/iommu/arm-smmu.c
View file

@ -1431,7 +1431,7 @@ static bool arm_smmu_capable(enum iommu_cap cap)
} }
} }
static int arm_smmu_match_node(struct device *dev, void *data) static int arm_smmu_match_node(struct device *dev, const void *data)
{ {
return dev->fwnode == data; return dev->fwnode == data;
} }

4
drivers/mfd/altera-sysmgr.c
View file

@ -92,9 +92,9 @@ static struct regmap_config altr_sysmgr_regmap_cfg = {
* Matching function used by driver_find_device(). * Matching function used by driver_find_device().
* Return: True if match is found, otherwise false. * Return: True if match is found, otherwise false.
*/ */
static int sysmgr_match_phandle(struct device *dev, void *data) static int sysmgr_match_phandle(struct device *dev, const void *data)
{ {
return dev->of_node == (struct device_node *)data; return dev->of_node == (const struct device_node *)data;
} }
/** /**

4
drivers/s390/cio/ccwgroup.c
View file

@ -581,7 +581,7 @@ int ccwgroup_driver_register(struct ccwgroup_driver *cdriver)
} }
EXPORT_SYMBOL(ccwgroup_driver_register); EXPORT_SYMBOL(ccwgroup_driver_register);
static int __ccwgroup_match_all(struct device *dev, void *data) static int __ccwgroup_match_all(struct device *dev, const void *data)
{ {
return 1; return 1;
} }
@ -608,7 +608,7 @@ void ccwgroup_driver_unregister(struct ccwgroup_driver *cdriver)
} }
EXPORT_SYMBOL(ccwgroup_driver_unregister); EXPORT_SYMBOL(ccwgroup_driver_unregister);
static int __ccwgroupdev_check_busid(struct device *dev, void *id) static int __ccwgroupdev_check_busid(struct device *dev, const void *id)
{ {
char *bus_id = id; char *bus_id = id;

2
drivers/s390/cio/chsc_sch.c
View file

@ -203,7 +203,7 @@ static void chsc_cleanup_sch_driver(void)
static DEFINE_SPINLOCK(chsc_lock); static DEFINE_SPINLOCK(chsc_lock);
static int chsc_subchannel_match_next_free(struct device *dev, void *data) static int chsc_subchannel_match_next_free(struct device *dev, const void *data)
{ {
struct subchannel *sch = to_subchannel(dev); struct subchannel *sch = to_subchannel(dev);

2
drivers/s390/cio/device.c
View file

@ -1653,7 +1653,7 @@ EXPORT_SYMBOL_GPL(ccw_device_force_console);
* get ccw_device matching the busid, but only if owned by cdrv * get ccw_device matching the busid, but only if owned by cdrv
*/ */
static int static int
__ccwdev_check_busid(struct device *dev, void *id) __ccwdev_check_busid(struct device *dev, const void *id)
{ {
char *bus_id; char *bus_id;

4
include/linux/device.h
View file

@ -336,8 +336,8 @@ extern int __must_check driver_for_each_device(struct device_driver *drv,
int (*fn)(struct device *dev, int (*fn)(struct device *dev,
void *)); void *));
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));
void driver_deferred_probe_add(struct device *dev); void driver_deferred_probe_add(struct device *dev);
int driver_deferred_probe_check_state(struct device *dev); int driver_deferred_probe_check_state(struct device *dev);