Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
* 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6:
i2c: Align i2c_device_id
tuner: Do not alter i2c_client.name
+9
-14
+7
-13
drivers/media/video/tuner-core.c
+7
-13
drivers/media/video/tuner-core.c
···
92
92
unsigned int type; /* chip type id */
93
93
unsigned int config;
94
94
int (*tuner_callback) (void *dev, int command, int arg);
95
+
const char *name;
95
96
};
96
97
97
98
/* standard i2c insmod options */
···
331
330
tuner_warn("Support for tuners in i2c address range 0x64 thru 0x6f\n");
332
331
tuner_warn("will soon be dropped. This message indicates that your\n");
333
332
tuner_warn("hardware has a %s tuner at i2c address 0x%02x.\n",
334
-
t->i2c->name, t->i2c->addr);
333
+
t->name, t->i2c->addr);
335
334
tuner_warn("To ensure continued support for your device, please\n");
336
335
tuner_warn("send a copy of this message, along with full dmesg\n");
337
336
tuner_warn("output to v4l-dvb-maintainer@linuxtv.org\n");
338
337
tuner_warn("Please use subject line: \"obsolete tuner i2c address.\"\n");
339
338
tuner_warn("driver: %s, addr: 0x%02x, type: %d (%s)\n",
340
-
t->i2c->adapter->name, t->i2c->addr, t->type, t->i2c->name);
339
+
t->i2c->adapter->name, t->i2c->addr, t->type, t->name);
341
340
tuner_warn("====================== WARNING! ======================\n");
342
341
}
343
342
···
471
470
if ((NULL == analog_ops->set_params) &&
472
471
(fe_tuner_ops->set_analog_params)) {
473
472
474
-
strlcpy(t->i2c->name, fe_tuner_ops->info.name,
475
-
sizeof(t->i2c->name));
473
+
t->name = fe_tuner_ops->info.name;
476
474
477
475
t->fe.analog_demod_priv = t;
478
476
memcpy(analog_ops, &tuner_core_ops,
479
477
sizeof(struct analog_demod_ops));
480
478
481
479
} else {
482
-
strlcpy(t->i2c->name, analog_ops->info.name,
483
-
sizeof(t->i2c->name));
480
+
t->name = analog_ops->info.name;
484
481
}
485
482
486
-
tuner_dbg("type set to %s\n", t->i2c->name);
483
+
tuner_dbg("type set to %s\n", t->name);
487
484
488
485
if (t->mode_mask == T_UNINITIALIZED)
489
486
t->mode_mask = new_mode_mask;
···
1114
1115
if (NULL == t)
1115
1116
return -ENOMEM;
1116
1117
t->i2c = client;
1118
+
t->name = "(tuner unset)";
1117
1119
i2c_set_clientdata(client, t);
1118
1120
t->type = UNSET;
1119
1121
t->audmode = V4L2_TUNER_MODE_STEREO;
···
1272
1272
1273
1273
list_del(&t->list);
1274
1274
kfree(t);
1275
-
1276
-
/* The probing code has overwritten the device name, restore it so
1277
-
that reloading the driver will work. Ideally the device name
1278
-
should not be overwritten in the first place, but for now that
1279
-
will do. */
1280
-
strlcpy(client->name, "tuner", I2C_NAME_SIZE);
1281
1275
return 0;
1282
1276
}
1283
1277
+2
-1
include/linux/mod_devicetable.h
+2
-1
include/linux/mod_devicetable.h