diff options
| author | Jean Delvare <khali@linux-fr.org> | 2008-05-11 14:37:06 -0400 |
|---|---|---|
| committer | Jean Delvare <khali@hyperion.delvare> | 2008-05-11 14:37:06 -0400 |
| commit | ae429083efe996ca2c569c44fd6fea440676dc33 (patch) | |
| tree | 85bc4b8d0e0ac034a751b652210f908ec33cc24f /include/media | |
| parent | 60b129d7bfa3e20450816983bd52c49bb0bc1c21 (diff) | |
i2c: Convert some more new-style drivers to use module aliasing
Update 3 more new-style i2c drivers to use standard module aliasing
instead of the old driver_name/type driver matching scheme. These
video drivers aren't used yet so converting them is trivial.
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'include/media')
| -rw-r--r-- | include/media/v4l2-i2c-drv-legacy.h | 2 | ||||
| -rw-r--r-- | include/media/v4l2-i2c-drv.h | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/include/media/v4l2-i2c-drv-legacy.h b/include/media/v4l2-i2c-drv-legacy.h index 347b6f8beb23..878562278b67 100644 --- a/include/media/v4l2-i2c-drv-legacy.h +++ b/include/media/v4l2-i2c-drv-legacy.h | |||
| @@ -31,6 +31,7 @@ struct v4l2_i2c_driver_data { | |||
| 31 | int (*resume)(struct i2c_client *client); | 31 | int (*resume)(struct i2c_client *client); |
| 32 | int (*legacy_probe)(struct i2c_adapter *adapter); | 32 | int (*legacy_probe)(struct i2c_adapter *adapter); |
| 33 | int legacy_class; | 33 | int legacy_class; |
| 34 | const struct i2c_device_id *id_table; | ||
| 34 | }; | 35 | }; |
| 35 | 36 | ||
| 36 | static struct v4l2_i2c_driver_data v4l2_i2c_data; | 37 | static struct v4l2_i2c_driver_data v4l2_i2c_data; |
| @@ -124,6 +125,7 @@ static int __init v4l2_i2c_drv_init(void) | |||
| 124 | v4l2_i2c_driver.command = v4l2_i2c_data.command; | 125 | v4l2_i2c_driver.command = v4l2_i2c_data.command; |
| 125 | v4l2_i2c_driver.probe = v4l2_i2c_data.probe; | 126 | v4l2_i2c_driver.probe = v4l2_i2c_data.probe; |
| 126 | v4l2_i2c_driver.remove = v4l2_i2c_data.remove; | 127 | v4l2_i2c_driver.remove = v4l2_i2c_data.remove; |
| 128 | v4l2_i2c_driver.id_table = v4l2_i2c_data.id_table; | ||
| 127 | err = i2c_add_driver(&v4l2_i2c_driver); | 129 | err = i2c_add_driver(&v4l2_i2c_driver); |
| 128 | if (err) | 130 | if (err) |
| 129 | i2c_del_driver(&v4l2_i2c_driver_legacy); | 131 | i2c_del_driver(&v4l2_i2c_driver_legacy); |
diff --git a/include/media/v4l2-i2c-drv.h b/include/media/v4l2-i2c-drv.h index 7b6f06be7950..40ecef29801d 100644 --- a/include/media/v4l2-i2c-drv.h +++ b/include/media/v4l2-i2c-drv.h | |||
| @@ -36,6 +36,7 @@ struct v4l2_i2c_driver_data { | |||
| 36 | int (*resume)(struct i2c_client *client); | 36 | int (*resume)(struct i2c_client *client); |
| 37 | int (*legacy_probe)(struct i2c_adapter *adapter); | 37 | int (*legacy_probe)(struct i2c_adapter *adapter); |
| 38 | int legacy_class; | 38 | int legacy_class; |
| 39 | const struct i2c_device_id *id_table; | ||
| 39 | }; | 40 | }; |
| 40 | 41 | ||
| 41 | static struct v4l2_i2c_driver_data v4l2_i2c_data; | 42 | static struct v4l2_i2c_driver_data v4l2_i2c_data; |
| @@ -53,6 +54,7 @@ static int __init v4l2_i2c_drv_init(void) | |||
| 53 | v4l2_i2c_driver.remove = v4l2_i2c_data.remove; | 54 | v4l2_i2c_driver.remove = v4l2_i2c_data.remove; |
| 54 | v4l2_i2c_driver.suspend = v4l2_i2c_data.suspend; | 55 | v4l2_i2c_driver.suspend = v4l2_i2c_data.suspend; |
| 55 | v4l2_i2c_driver.resume = v4l2_i2c_data.resume; | 56 | v4l2_i2c_driver.resume = v4l2_i2c_data.resume; |
| 57 | v4l2_i2c_driver.id_table = v4l2_i2c_data.id_table; | ||
| 56 | return i2c_add_driver(&v4l2_i2c_driver); | 58 | return i2c_add_driver(&v4l2_i2c_driver); |
| 57 | } | 59 | } |
| 58 | 60 | ||
