diff options
| author | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-11-11 14:09:06 -0600 |
|---|---|---|
| committer | Dave Kleikamp <shaggy@austin.ibm.com> | 2005-11-11 14:09:06 -0600 |
| commit | ca869912366f60cb5e0bdd09f65e80ee6816e73c (patch) | |
| tree | a72913a29495ca078987c09fc0008f47e11b900b /drivers/i2c/chips/isp1301_omap.c | |
| parent | dd8a306ac0c918268bd2ae89da2dea627f6e352d (diff) | |
| parent | 388f7ef720a982f49925e7b4e96f216f208f8c03 (diff) | |
| download | blackbird-op-linux-ca869912366f60cb5e0bdd09f65e80ee6816e73c.tar.gz blackbird-op-linux-ca869912366f60cb5e0bdd09f65e80ee6816e73c.zip | |
Merge with /home/shaggy/git/linus-clean/
Diffstat (limited to 'drivers/i2c/chips/isp1301_omap.c')
| -rw-r--r-- | drivers/i2c/chips/isp1301_omap.c | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/drivers/i2c/chips/isp1301_omap.c b/drivers/i2c/chips/isp1301_omap.c index 9dbb72fffbe2..d2a100d77839 100644 --- a/drivers/i2c/chips/isp1301_omap.c +++ b/drivers/i2c/chips/isp1301_omap.c @@ -873,26 +873,27 @@ static int otg_init(struct isp1301 *isp) return 0; } -static int otg_probe(struct device *dev) +static int otg_probe(struct platform_device *dev) { // struct omap_usb_config *config = dev->platform_data; - otg_dev = to_platform_device(dev); + otg_dev = dev; return 0; } -static int otg_remove(struct device *dev) +static int otg_remove(struct platform_device *dev) { otg_dev = 0; return 0; } -struct device_driver omap_otg_driver = { - .owner = THIS_MODULE, - .name = "omap_otg", - .bus = &platform_bus_type, +struct platform_driver omap_otg_driver = { .probe = otg_probe, - .remove = otg_remove, + .remove = otg_remove, + .driver = { + .owner = THIS_MODULE, + .name = "omap_otg", + }, }; static int otg_bind(struct isp1301 *isp) @@ -902,7 +903,7 @@ static int otg_bind(struct isp1301 *isp) if (otg_dev) return -EBUSY; - status = driver_register(&omap_otg_driver); + status = platform_driver_register(&omap_otg_driver); if (status < 0) return status; @@ -913,7 +914,7 @@ static int otg_bind(struct isp1301 *isp) status = -ENODEV; if (status < 0) - driver_unregister(&omap_otg_driver); + platform_driver_unregister(&omap_otg_driver); return status; } |
