diff options
| author | Laurent Riffard <laurent.riffard@free.fr> | 2005-12-18 10:49:30 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-01-06 01:16:26 -0500 |
| commit | d564baee2984098c73fd0e55bc5c8a890878ef3b (patch) | |
| tree | 0f92136763fbe9f614c72f9e5581a2f091ebf118 /drivers | |
| parent | 04b4b8434a92b9ef127985113c0bd961957778b7 (diff) | |
[PATCH] i2c: drop empty i2c_driver.command implementations
Given that implementing i2c_driver.command is optional, there is no
point in an empty implementation thereof.
Signed-off-by: Laurent Riffard <laurent.riffard@free.fr>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: Michael Geng <linux@MichaelGeng.de>
Cc: Petr Vandrovec <vandrove@vc.cvut.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/i2c/i2c-dev.c | 7 | ||||
| -rw-r--r-- | drivers/media/video/saa5246a.c | 7 | ||||
| -rw-r--r-- | drivers/media/video/saa5249.c | 7 | ||||
| -rw-r--r-- | drivers/video/matrox/matroxfb_maven.c | 5 |
4 files changed, 0 insertions, 26 deletions
diff --git a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c index ad6e04fc2c03..ed7eed388bae 100644 --- a/drivers/i2c/i2c-dev.c +++ b/drivers/i2c/i2c-dev.c | |||
| @@ -464,12 +464,6 @@ static int i2cdev_detach_client(struct i2c_client *client) | |||
| 464 | return 0; | 464 | return 0; |
| 465 | } | 465 | } |
| 466 | 466 | ||
| 467 | static int i2cdev_command(struct i2c_client *client, unsigned int cmd, | ||
| 468 | void *arg) | ||
| 469 | { | ||
| 470 | return -1; | ||
| 471 | } | ||
| 472 | |||
| 473 | static struct i2c_driver i2cdev_driver = { | 467 | static struct i2c_driver i2cdev_driver = { |
| 474 | .driver = { | 468 | .driver = { |
| 475 | .name = "dev_driver", | 469 | .name = "dev_driver", |
| @@ -478,7 +472,6 @@ static struct i2c_driver i2cdev_driver = { | |||
| 478 | .attach_adapter = i2cdev_attach_adapter, | 472 | .attach_adapter = i2cdev_attach_adapter, |
| 479 | .detach_adapter = i2cdev_detach_adapter, | 473 | .detach_adapter = i2cdev_detach_adapter, |
| 480 | .detach_client = i2cdev_detach_client, | 474 | .detach_client = i2cdev_detach_client, |
| 481 | .command = i2cdev_command, | ||
| 482 | }; | 475 | }; |
| 483 | 476 | ||
| 484 | static struct i2c_client i2cdev_client_template = { | 477 | static struct i2c_client i2cdev_client_template = { |
diff --git a/drivers/media/video/saa5246a.c b/drivers/media/video/saa5246a.c index 135c21479fc0..0aa9e72f632c 100644 --- a/drivers/media/video/saa5246a.c +++ b/drivers/media/video/saa5246a.c | |||
| @@ -151,12 +151,6 @@ static int saa5246a_detach(struct i2c_client *client) | |||
| 151 | return 0; | 151 | return 0; |
| 152 | } | 152 | } |
| 153 | 153 | ||
| 154 | static int saa5246a_command(struct i2c_client *device, unsigned int cmd, | ||
| 155 | void *arg) | ||
| 156 | { | ||
| 157 | return -EINVAL; | ||
| 158 | } | ||
| 159 | |||
| 160 | /* | 154 | /* |
| 161 | * I2C interfaces | 155 | * I2C interfaces |
| 162 | */ | 156 | */ |
| @@ -169,7 +163,6 @@ static struct i2c_driver i2c_driver_videotext = | |||
| 169 | .id = I2C_DRIVERID_SAA5249, /* in i2c.h */ | 163 | .id = I2C_DRIVERID_SAA5249, /* in i2c.h */ |
| 170 | .attach_adapter = saa5246a_probe, | 164 | .attach_adapter = saa5246a_probe, |
| 171 | .detach_client = saa5246a_detach, | 165 | .detach_client = saa5246a_detach, |
| 172 | .command = saa5246a_command | ||
| 173 | }; | 166 | }; |
| 174 | 167 | ||
| 175 | static struct i2c_client client_template = { | 168 | static struct i2c_client client_template = { |
diff --git a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c index d7c4e330cadd..a51c7bd96618 100644 --- a/drivers/media/video/saa5249.c +++ b/drivers/media/video/saa5249.c | |||
| @@ -226,12 +226,6 @@ static int saa5249_detach(struct i2c_client *client) | |||
| 226 | return 0; | 226 | return 0; |
| 227 | } | 227 | } |
| 228 | 228 | ||
| 229 | static int saa5249_command(struct i2c_client *device, | ||
| 230 | unsigned int cmd, void *arg) | ||
| 231 | { | ||
| 232 | return -EINVAL; | ||
| 233 | } | ||
| 234 | |||
| 235 | /* new I2C driver support */ | 229 | /* new I2C driver support */ |
| 236 | 230 | ||
| 237 | static struct i2c_driver i2c_driver_videotext = | 231 | static struct i2c_driver i2c_driver_videotext = |
| @@ -242,7 +236,6 @@ static struct i2c_driver i2c_driver_videotext = | |||
| 242 | .id = I2C_DRIVERID_SAA5249, /* in i2c.h */ | 236 | .id = I2C_DRIVERID_SAA5249, /* in i2c.h */ |
| 243 | .attach_adapter = saa5249_probe, | 237 | .attach_adapter = saa5249_probe, |
| 244 | .detach_client = saa5249_detach, | 238 | .detach_client = saa5249_detach, |
| 245 | .command = saa5249_command | ||
| 246 | }; | 239 | }; |
| 247 | 240 | ||
| 248 | static struct i2c_client client_template = { | 241 | static struct i2c_client client_template = { |
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c index 255875378a3f..a1f2c5e8fc88 100644 --- a/drivers/video/matrox/matroxfb_maven.c +++ b/drivers/video/matrox/matroxfb_maven.c | |||
| @@ -1288,10 +1288,6 @@ static int maven_detach_client(struct i2c_client* client) { | |||
| 1288 | return 0; | 1288 | return 0; |
| 1289 | } | 1289 | } |
| 1290 | 1290 | ||
| 1291 | static int maven_command(struct i2c_client* client, unsigned int cmd, void* arg) { | ||
| 1292 | return -ENOIOCTLCMD; /* or -EINVAL, depends on who will call this */ | ||
| 1293 | } | ||
| 1294 | |||
| 1295 | static struct i2c_driver maven_driver={ | 1291 | static struct i2c_driver maven_driver={ |
| 1296 | .driver = { | 1292 | .driver = { |
| 1297 | .name = "maven", | 1293 | .name = "maven", |
| @@ -1299,7 +1295,6 @@ static struct i2c_driver maven_driver={ | |||
| 1299 | .id = I2C_DRIVERID_MGATVO, | 1295 | .id = I2C_DRIVERID_MGATVO, |
| 1300 | .attach_adapter = maven_attach_adapter, | 1296 | .attach_adapter = maven_attach_adapter, |
| 1301 | .detach_client = maven_detach_client, | 1297 | .detach_client = maven_detach_client, |
| 1302 | .command = maven_command, | ||
| 1303 | }; | 1298 | }; |
| 1304 | 1299 | ||
| 1305 | /* ************************** */ | 1300 | /* ************************** */ |
