Auto-update from upstream

1 files changed, 3 insertions, 8 deletions

diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c
index ad60bbb16cdf..a1f2c5e8fc88 100644
--- a/drivers/video/matrox/matroxfb_maven.c
+++ b/drivers/video/matrox/matroxfb_maven.c
@@ -1288,18 +1288,13 @@ static int maven_detach_client(struct i2c_client* client) {
         return 0;
 }
 
-static int maven_command(struct i2c_client* client, unsigned int cmd, void* arg) {
-        return -ENOIOCTLCMD;    /* or -EINVAL, depends on who will call this */
-}
-
 static struct i2c_driver maven_driver={
-        .owner          = THIS_MODULE,
-        .name           = "maven",
+        .driver = {
+                .name   = "maven",
+        },
         .id             = I2C_DRIVERID_MGATVO,
-        .flags          = I2C_DF_NOTIFY,
         .attach_adapter = maven_attach_adapter,
         .detach_client  = maven_detach_client,
-        .command        = maven_command,
 };
 
 /* ************************** */