9
0
Fork 0

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:
Alexander Shiyan 2013-07-12 00:23:28 +04:00 committed by Sascha Hauer
parent 10920b6fe2
commit 7bc400d14c
3 changed files with 26 additions and 25 deletions

View File

@ -46,3 +46,27 @@ int bus_register(struct bus_type *bus)
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;
}

View File

@ -21,30 +21,6 @@
#include <errno.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)
{
return dev->driver->probe(dev);
@ -71,7 +47,7 @@ int platform_device_register(struct device_d *new_device)
struct bus_type platform_bus = {
.name = "platform",
.match = platform_match,
.match = device_match,
.probe = platform_probe,
.remove = platform_remove,
};

View File

@ -384,6 +384,7 @@ struct bus_type {
};
int bus_register(struct bus_type *bus);
int device_match(struct device_d *dev, struct driver_d *drv);
extern struct list_head bus_list;