base: Transform "platform_match" into "device_match" and make this function public
This change will allow reuse this function for other buses. Signed-off-by: Alexander Shiyan <shc_work@mail.ru> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
10920b6fe2
commit
7bc400d14c
|
@ -46,3 +46,27 @@ int bus_register(struct bus_type *bus)
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int device_match(struct device_d *dev, struct driver_d *drv)
|
||||||
|
{
|
||||||
|
if (IS_ENABLED(CONFIG_OFDEVICE) && dev->device_node &&
|
||||||
|
drv->of_compatible)
|
||||||
|
return of_match(dev, drv);
|
||||||
|
|
||||||
|
if (!strcmp(dev->name, drv->name))
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
if (drv->id_table) {
|
||||||
|
struct platform_device_id *id = drv->id_table;
|
||||||
|
|
||||||
|
while (id->name) {
|
||||||
|
if (!strcmp(id->name, dev->name)) {
|
||||||
|
dev->id_entry = id;
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
id++;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
|
@ -21,30 +21,6 @@
|
||||||
#include <errno.h>
|
#include <errno.h>
|
||||||
#include <init.h>
|
#include <init.h>
|
||||||
|
|
||||||
static int platform_match(struct device_d *dev, struct driver_d *drv)
|
|
||||||
{
|
|
||||||
if (IS_ENABLED(CONFIG_OFDEVICE) && dev->device_node &&
|
|
||||||
drv->of_compatible)
|
|
||||||
return of_match(dev, drv);
|
|
||||||
|
|
||||||
if (!strcmp(dev->name, drv->name))
|
|
||||||
return 0;
|
|
||||||
|
|
||||||
if (drv->id_table) {
|
|
||||||
struct platform_device_id *id = drv->id_table;
|
|
||||||
|
|
||||||
while (id->name) {
|
|
||||||
if (!strcmp(id->name, dev->name)) {
|
|
||||||
dev->id_entry = id;
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
id++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
static int platform_probe(struct device_d *dev)
|
static int platform_probe(struct device_d *dev)
|
||||||
{
|
{
|
||||||
return dev->driver->probe(dev);
|
return dev->driver->probe(dev);
|
||||||
|
@ -71,7 +47,7 @@ int platform_device_register(struct device_d *new_device)
|
||||||
|
|
||||||
struct bus_type platform_bus = {
|
struct bus_type platform_bus = {
|
||||||
.name = "platform",
|
.name = "platform",
|
||||||
.match = platform_match,
|
.match = device_match,
|
||||||
.probe = platform_probe,
|
.probe = platform_probe,
|
||||||
.remove = platform_remove,
|
.remove = platform_remove,
|
||||||
};
|
};
|
||||||
|
|
|
@ -384,6 +384,7 @@ struct bus_type {
|
||||||
};
|
};
|
||||||
|
|
||||||
int bus_register(struct bus_type *bus);
|
int bus_register(struct bus_type *bus);
|
||||||
|
int device_match(struct device_d *dev, struct driver_d *drv);
|
||||||
|
|
||||||
extern struct list_head bus_list;
|
extern struct list_head bus_list;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue