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

[deliverable/linux.git] / drivers / media / video / tuner-core.c

diff --git a/drivers/media/video/tuner-core.c b/drivers/media/video/tuner-core.c
index 73c4041c35d78811f1fdd25585c6187c5ffa32b3..e8c854948de96d9c7f7268b74527902ed30a47a6 100644 (file)
--- a/drivers/media/video/tuner-core.c
+++ b/drivers/media/video/tuner-core.c
@@ -206,7 +206,7 @@ static void set_type(struct i2c_client *c, unsigned int type,
 
        set_freq(c, t->freq);
        tuner_dbg("%s %s I2C addr 0x%02x with type %d used for 0x%02x\n",
-                 c->adapter->name, c->driver->name, c->addr << 1, type,
+                 c->adapter->name, c->driver->driver.name, c->addr << 1, type,
                  t->mode_mask);
 }
 
@@ -251,7 +251,7 @@ static inline int check_mode(struct tuner *t, char *cmd)
 
 static char pal[] = "-";
 module_param_string(pal, pal, sizeof(pal), 0644);
-static char secam[] = "-";
+static char secam[] = "--";
 module_param_string(secam, secam, sizeof(secam), 0644);
 
 /* get more precise norm info from insmod option */
@@ -307,8 +307,13 @@ static int tuner_fixup_std(struct tuner *t)
                        break;
                case 'l':
                case 'L':
-                       tuner_dbg ("insmod fixup: SECAM => SECAM-L\n");
-                       t->std = V4L2_STD_SECAM_L;
+                       if ((secam[1]=='C')||(secam[1]=='c')) {
+                               tuner_dbg ("insmod fixup: SECAM => SECAM-L'\n");
+                               t->std = V4L2_STD_SECAM_LC;
+                       } else {
+                               tuner_dbg ("insmod fixup: SECAM => SECAM-L\n");
+                               t->std = V4L2_STD_SECAM_L;
+                       }
                        break;
                case '-':
                        /* default parameter, do nothing */
@@ -737,21 +742,19 @@ static int tuner_resume(struct device *dev)
 /* ----------------------------------------------------------------------- */
 
 static struct i2c_driver driver = {
-       .owner = THIS_MODULE,
-       .name = "tuner",
        .id = I2C_DRIVERID_TUNER,
-       .flags = I2C_DF_NOTIFY,
        .attach_adapter = tuner_probe,
        .detach_client = tuner_detach,
        .command = tuner_command,
        .driver = {
+                  .owner = THIS_MODULE,
+                  .name = "tuner",
                   .suspend = tuner_suspend,
                   .resume = tuner_resume,
                   },
 };
 static struct i2c_client client_template = {
        .name = "(tuner unset)",
-       .flags = I2C_CLIENT_ALLOW_USE,
        .driver = &driver,
 };