Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-10 23:20:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ibmebus: convert of_platform_driver to platform_driver

Browse Source 
ibmebus is the last remaining user of of_platform_driver and the
conversion to a regular platform driver is trivial.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Tested-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Grant Likely <grant.likely@linaro.org>
This commit is contained in:
Rob Herring 2013-04-20 21:51:08 -05:00 committed by Grant Likely
parent 10dbc5e39a
commit c45640e4a9
4 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/include/asm/ibmebus.h
View File

@ -48,8 +48,8 @@
extern struct bus_type ibmebus_bus_type; extern struct bus_type ibmebus_bus_type;
int ibmebus_register_driver(struct of_platform_driver *drv); int ibmebus_register_driver(struct platform_driver *drv);
void ibmebus_unregister_driver(struct of_platform_driver *drv); void ibmebus_unregister_driver(struct platform_driver *drv);
int ibmebus_request_irq(u32 ist, irq_handler_t handler, int ibmebus_request_irq(u32 ist, irq_handler_t handler,
unsigned long irq_flags, const char *devname, unsigned long irq_flags, const char *devname,

22
arch/powerpc/kernel/ibmebus.c
View File

@ -205,7 +205,7 @@ static int ibmebus_create_devices(const struct of_device_id *matches)
return ret; return ret;
} }
int ibmebus_register_driver(struct of_platform_driver *drv) int ibmebus_register_driver(struct platform_driver *drv)
{ {
/* If the driver uses devices that ibmebus doesn't know, add them */ /* If the driver uses devices that ibmebus doesn't know, add them */
ibmebus_create_devices(drv->driver.of_match_table); ibmebus_create_devices(drv->driver.of_match_table);
@ -215,7 +215,7 @@ int ibmebus_register_driver(struct of_platform_driver *drv)
} }
EXPORT_SYMBOL(ibmebus_register_driver); EXPORT_SYMBOL(ibmebus_register_driver);
void ibmebus_unregister_driver(struct of_platform_driver *drv) void ibmebus_unregister_driver(struct platform_driver *drv)
{ {
driver_unregister(&drv->driver); driver_unregister(&drv->driver);
} }
@ -338,11 +338,10 @@ static int ibmebus_bus_bus_match(struct device *dev, struct device_driver *drv)
static int ibmebus_bus_device_probe(struct device *dev) static int ibmebus_bus_device_probe(struct device *dev)
{ {
int error = -ENODEV; int error = -ENODEV;
struct of_platform_driver *drv; struct platform_driver *drv;
struct platform_device *of_dev; struct platform_device *of_dev;
const struct of_device_id *match;
drv = to_of_platform_driver(dev->driver); drv = to_platform_driver(dev->driver);
of_dev = to_platform_device(dev); of_dev = to_platform_device(dev);
if (!drv->probe) if (!drv->probe)
@ -350,9 +349,8 @@ static int ibmebus_bus_device_probe(struct device *dev)
of_dev_get(of_dev); of_dev_get(of_dev);
match = of_match_device(drv->driver.of_match_table, dev); if (of_driver_match_device(dev, dev->driver))
if (match) error = drv->probe(of_dev);
error = drv->probe(of_dev, match);
if (error) if (error)
of_dev_put(of_dev); of_dev_put(of_dev);
@ -362,7 +360,7 @@ static int ibmebus_bus_device_probe(struct device *dev)
static int ibmebus_bus_device_remove(struct device *dev) static int ibmebus_bus_device_remove(struct device *dev)
{ {
struct platform_device *of_dev = to_platform_device(dev); struct platform_device *of_dev = to_platform_device(dev);
struct of_platform_driver *drv = to_of_platform_driver(dev->driver); struct platform_driver *drv = to_platform_driver(dev->driver);
if (dev->driver && drv->remove) if (dev->driver && drv->remove)
drv->remove(of_dev); drv->remove(of_dev);
@ -372,7 +370,7 @@ static int ibmebus_bus_device_remove(struct device *dev)
static void ibmebus_bus_device_shutdown(struct device *dev) static void ibmebus_bus_device_shutdown(struct device *dev)
{ {
struct platform_device *of_dev = to_platform_device(dev); struct platform_device *of_dev = to_platform_device(dev);
struct of_platform_driver *drv = to_of_platform_driver(dev->driver); struct platform_driver *drv = to_platform_driver(dev->driver);
if (dev->driver && drv->shutdown) if (dev->driver && drv->shutdown)
drv->shutdown(of_dev); drv->shutdown(of_dev);
@ -419,7 +417,7 @@ struct device_attribute ibmebus_bus_device_attrs[] = {
static int ibmebus_bus_legacy_suspend(struct device *dev, pm_message_t mesg) static int ibmebus_bus_legacy_suspend(struct device *dev, pm_message_t mesg)
{ {
struct platform_device *of_dev = to_platform_device(dev); struct platform_device *of_dev = to_platform_device(dev);
struct of_platform_driver *drv = to_of_platform_driver(dev->driver); struct platform_driver *drv = to_platform_driver(dev->driver);
int ret = 0; int ret = 0;
if (dev->driver && drv->suspend) if (dev->driver && drv->suspend)
@ -430,7 +428,7 @@ static int ibmebus_bus_legacy_suspend(struct device *dev, pm_message_t mesg)
static int ibmebus_bus_legacy_resume(struct device *dev) static int ibmebus_bus_legacy_resume(struct device *dev)
{ {
struct platform_device *of_dev = to_platform_device(dev); struct platform_device *of_dev = to_platform_device(dev);
struct of_platform_driver *drv = to_of_platform_driver(dev->driver); struct platform_driver *drv = to_platform_driver(dev->driver);
int ret = 0; int ret = 0;
if (dev->driver && drv->resume) if (dev->driver && drv->resume)

5
drivers/infiniband/hw/ehca/ehca_main.c
View File

@ -713,8 +713,7 @@ static struct attribute_group ehca_dev_attr_grp = {
.attrs = ehca_dev_attrs .attrs = ehca_dev_attrs
}; };
static int ehca_probe(struct platform_device *dev, static int ehca_probe(struct platform_device *dev)
const struct of_device_id *id)
{ {
struct ehca_shca *shca; struct ehca_shca *shca;
const u64 *handle; const u64 *handle;
@ -937,7 +936,7 @@ static struct of_device_id ehca_device_table[] =
}; };
MODULE_DEVICE_TABLE(of, ehca_device_table); MODULE_DEVICE_TABLE(of, ehca_device_table);
static struct of_platform_driver ehca_driver = { static struct platform_driver ehca_driver = {
.probe = ehca_probe, .probe = ehca_probe,
.remove = ehca_remove, .remove = ehca_remove,
.driver = { .driver = {

8
drivers/net/ethernet/ibm/ehea/ehea_main.c
View File

@ -98,8 +98,7 @@ static struct ehea_fw_handle_array ehea_fw_handles;
static struct ehea_bcmc_reg_array ehea_bcmc_regs; static struct ehea_bcmc_reg_array ehea_bcmc_regs;
static int ehea_probe_adapter(struct platform_device *dev, static int ehea_probe_adapter(struct platform_device *dev);
const struct of_device_id *id);
static int ehea_remove(struct platform_device *dev); static int ehea_remove(struct platform_device *dev);
@ -112,7 +111,7 @@ static struct of_device_id ehea_device_table[] = {
}; };
MODULE_DEVICE_TABLE(of, ehea_device_table); MODULE_DEVICE_TABLE(of, ehea_device_table);
static struct of_platform_driver ehea_driver = { static struct platform_driver ehea_driver = {
.driver = { .driver = {
.name = "ehea", .name = "ehea",
.owner = THIS_MODULE, .owner = THIS_MODULE,
@ -3251,8 +3250,7 @@ static void ehea_remove_device_sysfs(struct platform_device *dev)
device_remove_file(&dev->dev, &dev_attr_remove_port); device_remove_file(&dev->dev, &dev_attr_remove_port);
} }
static int ehea_probe_adapter(struct platform_device *dev, static int ehea_probe_adapter(struct platform_device *dev)
const struct of_device_id *id)
{ {
struct ehea_adapter *adapter; struct ehea_adapter *adapter;
const u64 *adapter_handle; const u64 *adapter_handle;