[PATCH] i2c: Drop i2c_driver.{owner,name}, 5 of 11

[deliverable/linux.git] / drivers / media / video / tvmixer.c

diff --git a/drivers/media/video/tvmixer.c b/drivers/media/video/tvmixer.c
index 8318bd1aad000450713fd30bf8200a222516b12f..5f4d01854767a47651f0f3f025be1292fd3781e8 100644 (file)
--- a/drivers/media/video/tvmixer.c
+++ b/drivers/media/video/tvmixer.c
@@ -228,16 +228,15 @@ static int tvmixer_release(struct inode *inode, struct file *file)
 
 static struct i2c_driver driver = {
 #ifdef I2C_PEC
-       .owner           = THIS_MODULE,
-#endif
+       .driver = {
+               .owner   = THIS_MODULE,
+               .name    = "tv card mixer driver",
+       },
+#else
        .name            = "tv card mixer driver",
+#endif
        .id              = I2C_DRIVERID_TVMIXER,
-#ifdef I2C_DF_DUMMY
-       .flags           = I2C_DF_DUMMY,
-#else
-       .flags           = I2C_DF_NOTIFY,
        .detach_adapter  = tvmixer_adapters,
-#endif
        .attach_adapter  = tvmixer_adapters,
        .detach_client   = tvmixer_clients,
 };