diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-11-09 17:32:44 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-11-09 17:32:44 -0500 |
commit | 3ae5eaec1d2d9c0cf53745352e7d4b152810ba24 (patch) | |
tree | d8825be54cefb6ad6707478d719c8e30605bee7b /drivers/i2c/chips | |
parent | 00d3dcdd96646be6059cc21f2efa94c4edc1eda5 (diff) |
[DRIVER MODEL] Convert platform drivers to use struct platform_driver
This allows us to eliminate the casts in the drivers, and eventually
remove the use of the device_driver function pointer methods for
platform device drivers.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/i2c/chips')
-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) | |||
873 | return 0; | 873 | return 0; |
874 | } | 874 | } |
875 | 875 | ||
876 | static int otg_probe(struct device *dev) | 876 | static int otg_probe(struct platform_device *dev) |
877 | { | 877 | { |
878 | // struct omap_usb_config *config = dev->platform_data; | 878 | // struct omap_usb_config *config = dev->platform_data; |
879 | 879 | ||
880 | otg_dev = to_platform_device(dev); | 880 | otg_dev = dev; |
881 | return 0; | 881 | return 0; |
882 | } | 882 | } |
883 | 883 | ||
884 | static int otg_remove(struct device *dev) | 884 | static int otg_remove(struct platform_device *dev) |
885 | { | 885 | { |
886 | otg_dev = 0; | 886 | otg_dev = 0; |
887 | return 0; | 887 | return 0; |
888 | } | 888 | } |
889 | 889 | ||
890 | struct device_driver omap_otg_driver = { | 890 | struct platform_driver omap_otg_driver = { |
891 | .owner = THIS_MODULE, | ||
892 | .name = "omap_otg", | ||
893 | .bus = &platform_bus_type, | ||
894 | .probe = otg_probe, | 891 | .probe = otg_probe, |
895 | .remove = otg_remove, | 892 | .remove = otg_remove, |
893 | .driver = { | ||
894 | .owner = THIS_MODULE, | ||
895 | .name = "omap_otg", | ||
896 | }, | ||
896 | }; | 897 | }; |
897 | 898 | ||
898 | static int otg_bind(struct isp1301 *isp) | 899 | static int otg_bind(struct isp1301 *isp) |
@@ -902,7 +903,7 @@ static int otg_bind(struct isp1301 *isp) | |||
902 | if (otg_dev) | 903 | if (otg_dev) |
903 | return -EBUSY; | 904 | return -EBUSY; |
904 | 905 | ||
905 | status = driver_register(&omap_otg_driver); | 906 | status = platform_driver_register(&omap_otg_driver); |
906 | if (status < 0) | 907 | if (status < 0) |
907 | return status; | 908 | return status; |
908 | 909 | ||
@@ -913,7 +914,7 @@ static int otg_bind(struct isp1301 *isp) | |||
913 | status = -ENODEV; | 914 | status = -ENODEV; |
914 | 915 | ||
915 | if (status < 0) | 916 | if (status < 0) |
916 | driver_unregister(&omap_otg_driver); | 917 | platform_driver_unregister(&omap_otg_driver); |
917 | return status; | 918 | return status; |
918 | } | 919 | } |
919 | 920 | ||