Commit b259e7d2 authored by Paul Sokolovsky's avatar Paul Sokolovsky Committed by David S. Miller

[IrDA]: PXA FIR code device model conversion

pxaficp_ir.c was not converted to the device model framework.
Signed-off-by: default avatarPaul Sokolovsky <pmiscml@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarSamuel Ortiz <samuel@sortiz.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 48d4ed7a
...@@ -704,9 +704,9 @@ static int pxa_irda_stop(struct net_device *dev) ...@@ -704,9 +704,9 @@ static int pxa_irda_stop(struct net_device *dev)
return 0; return 0;
} }
static int pxa_irda_suspend(struct device *_dev, pm_message_t state) static int pxa_irda_suspend(struct platform_device *_dev, pm_message_t state)
{ {
struct net_device *dev = dev_get_drvdata(_dev); struct net_device *dev = platform_get_drvdata(_dev);
struct pxa_irda *si; struct pxa_irda *si;
if (dev && netif_running(dev)) { if (dev && netif_running(dev)) {
...@@ -718,9 +718,9 @@ static int pxa_irda_suspend(struct device *_dev, pm_message_t state) ...@@ -718,9 +718,9 @@ static int pxa_irda_suspend(struct device *_dev, pm_message_t state)
return 0; return 0;
} }
static int pxa_irda_resume(struct device *_dev) static int pxa_irda_resume(struct platform_device *_dev)
{ {
struct net_device *dev = dev_get_drvdata(_dev); struct net_device *dev = platform_get_drvdata(_dev);
struct pxa_irda *si; struct pxa_irda *si;
if (dev && netif_running(dev)) { if (dev && netif_running(dev)) {
...@@ -746,9 +746,8 @@ static int pxa_irda_init_iobuf(iobuff_t *io, int size) ...@@ -746,9 +746,8 @@ static int pxa_irda_init_iobuf(iobuff_t *io, int size)
return io->head ? 0 : -ENOMEM; return io->head ? 0 : -ENOMEM;
} }
static int pxa_irda_probe(struct device *_dev) static int pxa_irda_probe(struct platform_device *pdev)
{ {
struct platform_device *pdev = to_platform_device(_dev);
struct net_device *dev; struct net_device *dev;
struct pxa_irda *si; struct pxa_irda *si;
unsigned int baudrate_mask; unsigned int baudrate_mask;
...@@ -822,9 +821,9 @@ static int pxa_irda_probe(struct device *_dev) ...@@ -822,9 +821,9 @@ static int pxa_irda_probe(struct device *_dev)
return err; return err;
} }
static int pxa_irda_remove(struct device *_dev) static int pxa_irda_remove(struct platform_device *_dev)
{ {
struct net_device *dev = dev_get_drvdata(_dev); struct net_device *dev = platform_get_drvdata(_dev);
if (dev) { if (dev) {
struct pxa_irda *si = netdev_priv(dev); struct pxa_irda *si = netdev_priv(dev);
...@@ -840,9 +839,10 @@ static int pxa_irda_remove(struct device *_dev) ...@@ -840,9 +839,10 @@ static int pxa_irda_remove(struct device *_dev)
return 0; return 0;
} }
static struct device_driver pxa_ir_driver = { static struct platform_driver pxa_ir_driver = {
.driver = {
.name = "pxa2xx-ir", .name = "pxa2xx-ir",
.bus = &platform_bus_type, },
.probe = pxa_irda_probe, .probe = pxa_irda_probe,
.remove = pxa_irda_remove, .remove = pxa_irda_remove,
.suspend = pxa_irda_suspend, .suspend = pxa_irda_suspend,
...@@ -851,12 +851,12 @@ static struct device_driver pxa_ir_driver = { ...@@ -851,12 +851,12 @@ static struct device_driver pxa_ir_driver = {
static int __init pxa_irda_init(void) static int __init pxa_irda_init(void)
{ {
return driver_register(&pxa_ir_driver); return platform_driver_register(&pxa_ir_driver);
} }
static void __exit pxa_irda_exit(void) static void __exit pxa_irda_exit(void)
{ {
driver_unregister(&pxa_ir_driver); platform_driver_unregister(&pxa_ir_driver);
} }
module_init(pxa_irda_init); module_init(pxa_irda_init);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment