diff options
Diffstat (limited to 'drivers/media/video/soc_camera.c')
| -rw-r--r-- | drivers/media/video/soc_camera.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/media/video/soc_camera.c b/drivers/media/video/soc_camera.c index a1b92446c8b4..d015bfe00950 100644 --- a/drivers/media/video/soc_camera.c +++ b/drivers/media/video/soc_camera.c | |||
| @@ -763,15 +763,6 @@ static struct device_driver ic_drv = { | |||
| 763 | .owner = THIS_MODULE, | 763 | .owner = THIS_MODULE, |
| 764 | }; | 764 | }; |
| 765 | 765 | ||
| 766 | /* | ||
| 767 | * Image capture host - this is a host device, not a bus device, so, | ||
| 768 | * no bus reference, no probing. | ||
| 769 | */ | ||
| 770 | static struct class soc_camera_host_class = { | ||
| 771 | .owner = THIS_MODULE, | ||
| 772 | .name = "camera_host", | ||
| 773 | }; | ||
| 774 | |||
| 775 | static void dummy_release(struct device *dev) | 766 | static void dummy_release(struct device *dev) |
| 776 | { | 767 | { |
| 777 | } | 768 | } |
| @@ -801,7 +792,6 @@ int soc_camera_host_register(struct soc_camera_host *ici) | |||
| 801 | 792 | ||
| 802 | /* Number might be equal to the platform device ID */ | 793 | /* Number might be equal to the platform device ID */ |
| 803 | sprintf(ici->dev.bus_id, "camera_host%d", ici->nr); | 794 | sprintf(ici->dev.bus_id, "camera_host%d", ici->nr); |
| 804 | ici->dev.class = &soc_camera_host_class; | ||
| 805 | 795 | ||
| 806 | mutex_lock(&list_lock); | 796 | mutex_lock(&list_lock); |
| 807 | list_for_each_entry(ix, &hosts, list) { | 797 | list_for_each_entry(ix, &hosts, list) { |
| @@ -1003,14 +993,9 @@ static int __init soc_camera_init(void) | |||
| 1003 | ret = driver_register(&ic_drv); | 993 | ret = driver_register(&ic_drv); |
| 1004 | if (ret) | 994 | if (ret) |
| 1005 | goto edrvr; | 995 | goto edrvr; |
| 1006 | ret = class_register(&soc_camera_host_class); | ||
| 1007 | if (ret) | ||
| 1008 | goto eclr; | ||
| 1009 | 996 | ||
| 1010 | return 0; | 997 | return 0; |
| 1011 | 998 | ||
| 1012 | eclr: | ||
| 1013 | driver_unregister(&ic_drv); | ||
| 1014 | edrvr: | 999 | edrvr: |
| 1015 | bus_unregister(&soc_camera_bus_type); | 1000 | bus_unregister(&soc_camera_bus_type); |
| 1016 | return ret; | 1001 | return ret; |
| @@ -1018,7 +1003,6 @@ edrvr: | |||
| 1018 | 1003 | ||
| 1019 | static void __exit soc_camera_exit(void) | 1004 | static void __exit soc_camera_exit(void) |
| 1020 | { | 1005 | { |
| 1021 | class_unregister(&soc_camera_host_class); | ||
| 1022 | driver_unregister(&ic_drv); | 1006 | driver_unregister(&ic_drv); |
| 1023 | bus_unregister(&soc_camera_bus_type); | 1007 | bus_unregister(&soc_camera_bus_type); |
| 1024 | } | 1008 | } |
