* [BK PATCH] Yet more i2c driver changes for 2.5.65
@ 2005-05-19 6:23 ` Greg KH
0 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2003-03-23 8:07 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel, sensors
Hi,
Here are some more i2c driver changes, they include the stuff I sent out
Friday, but haven't ended up in your tree yet, and 4 patches to fix up
some drivers in the rest of the kernel tree that were broken by my
previous i2c changes.
Please pull from: bk://kernel.bkbits.net/gregkh/linux/i2c-2.5
I'll post just the new patches to the mailing lists.
thanks,
greg k-h
drivers/acorn/char/i2c.c | 4
drivers/i2c/busses/i2c-ali15x3.c | 8 -
drivers/i2c/busses/i2c-amd756.c | 6 -
drivers/i2c/busses/i2c-amd8111.c | 4
drivers/i2c/busses/i2c-i801.c | 8 -
drivers/i2c/busses/i2c-isa.c | 4
drivers/i2c/busses/i2c-piix4.c | 8 -
drivers/i2c/chips/adm1021.c | 21 +--
drivers/i2c/chips/lm75.c | 14 +-
drivers/i2c/i2c-algo-bit.c | 13 +-
drivers/i2c/i2c-algo-pcf.c | 19 +--
drivers/i2c/i2c-core.c | 99 ++++++++--------
drivers/i2c/i2c-dev.c | 21 +--
drivers/i2c/i2c-elektor.c | 10 +
drivers/i2c/i2c-elv.c | 6 -
drivers/i2c/i2c-philips-par.c | 4
drivers/i2c/i2c-proc.c | 180 +++++++-----------------------
drivers/i2c/i2c-velleman.c | 4
drivers/i2c/scx200_acb.c | 32 ++---
drivers/ieee1394/pcilynx.c | 4
drivers/media/video/adv7175.c | 22 ++-
drivers/media/video/bt819.c | 33 +++--
drivers/media/video/bt856.c | 27 ++--
drivers/media/video/bttv-if.c | 22 ++-
drivers/media/video/msp3400.c | 32 ++---
drivers/media/video/saa5249.c | 13 +-
drivers/media/video/saa7110.c | 19 +--
drivers/media/video/saa7111.c | 21 ++-
drivers/media/video/saa7134/saa7134-i2c.c | 10 +
drivers/media/video/saa7185.c | 19 +--
drivers/media/video/tda7432.c | 16 +-
drivers/media/video/tda9875.c | 16 +-
drivers/media/video/tda9887.c | 14 +-
drivers/media/video/tuner-3036.c | 6 -
drivers/media/video/tuner.c | 29 ++--
drivers/media/video/tvaudio.c | 44 +++----
drivers/video/matrox/i2c-matroxfb.c | 11 +
include/linux/i2c.h | 33 +++--
38 files changed, 424 insertions(+), 432 deletions(-)
------
Greg Kroah-Hartman <greg@kroah.com>:
o i2c: fix up drivers/video/matrox/i2c-matroxfb.c due to previous i2c changes
o i2c: fix up drivers/ieee1394/pcilynx.c due to previous i2c changes
o i2c: fix up drivers/acorn/char/i2c.c due to previous i2c changes
o i2c: fix up drivers/media/video/* due to previous i2c changes
o i2c: ugh, clean up lindent mess in i2c-proc.c::i2c_detect()
o i2c: fix up the chip driver names to play nice with sysfs
o i2c: actually register the i2c client device with the driver core
o i2c: Removed the name variable from i2c_client as the dev one should be used instead
o i2c: remove the data field from struct i2c_client
o i2c: add struct device to i2c_client structure
o i2c: remove *data from i2c_adapter, as dev->data should be used instead
o i2c: remove i2c_adapter->name and use dev->name instead
Petr Vandrovec <vandrove@vc.cvut.cz>:
o Fix kobject_get oopses triggered by i2c in 2.5.65-bk
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH] Yet more i2c driver changes for 2.5.65
2005-05-19 6:23 ` Greg KH
@ 2005-05-19 6:23 ` Greg KH
-1 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2003-03-23 8:14 UTC (permalink / raw)
To: linux-kernel, sensors
ChangeSet 1.889.354.14, 2003/03/22 23:20:40-08:00, greg@kroah.com
i2c: fix up drivers/media/video/* due to previous i2c changes.
diff -Nru a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
--- a/drivers/media/video/adv7175.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/adv7175.c Sun Mar 23 00:11:01 2003
@@ -170,6 +170,7 @@
client=kmalloc(sizeof(*client), GFP_KERNEL);
if(client == NULL)
return -ENOMEM;
+ memset(client, 0, sizeof(*client));
client_template.adapter = adap;
client_template.addr = addr;
@@ -190,9 +191,10 @@
// We should never get here!!!
dname = unknown_name;
}
- strcpy(client->name, dname);
+ strncpy(client->dev.name, dname, DEVICE_NAME_SIZE);
init_MUTEX(&encoder->lock);
encoder->client = client;
+ i2c_set_clientdata(client, encoder);
encoder->addr = addr;
encoder->norm = VIDEO_MODE_PAL;
encoder->input = 0;
@@ -201,7 +203,7 @@
for (i=1; i<x_common; i++) {
rv = i2c_smbus_write_byte(client,init_common[i]);
if (rv < 0) {
- printk(KERN_ERR "%s_attach: init error %d\n", client->name, rv);
+ printk(KERN_ERR "%s_attach: init error %d\n", client->dev.name, rv);
break;
}
}
@@ -211,7 +213,7 @@
i2c_smbus_write_byte_data(client,0x07, TR0MODE);
i2c_smbus_read_byte_data(client,0x12);
printk(KERN_INFO "%s_attach: %s rev. %d at 0x%02x\n",
- client->name, dname, rv & 1, client->addr);
+ client->dev.name, dname, rv & 1, client->addr);
}
i2c_attach_client(client);
@@ -229,7 +231,7 @@
static int adv717x_detach(struct i2c_client *client)
{
i2c_detach_client(client);
- kfree(client->data);
+ i2c_get_clientdata(client);
kfree(client);
return 0;
}
@@ -237,7 +239,7 @@
static int adv717x_command(struct i2c_client *client, unsigned int cmd,
void *arg)
{
- struct adv7175 *encoder = client->data;
+ struct adv7175 *encoder = i2c_get_clientdata(client);
int i, x_ntsc=13, x_pal=13;
/* x_ntsc is number of entries in init_ntsc -1 */
/* x_pal is number of entries in init_pal -1 */
@@ -297,7 +299,7 @@
default:
printk(KERN_ERR
"%s: illegal norm: %d\n",
- client->name, iarg);
+ client->dev.name, iarg);
return -EINVAL;
}
@@ -353,7 +355,7 @@
default:
printk(KERN_ERR
"%s: illegal input: %d\n",
- client->name, iarg);
+ client->dev.name, iarg);
return -EINVAL;
}
@@ -419,8 +421,10 @@
};
static struct i2c_client client_template = {
- .name = "adv7175_client",
- .driver = &i2c_driver_adv7175
+ .driver = &i2c_driver_adv7175,
+ .dev = {
+ .name = "adv7175_client",
+ },
};
static int adv717x_init(void)
diff -Nru a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
--- a/drivers/media/video/bt819.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/bt819.c Sun Mar 23 00:11:01 2003
@@ -128,7 +128,7 @@
struct timing *timing;
- decoder = client->data;
+ decoder = i2c_get_clientdata(client);
timing = &timing_data[decoder->norm];
init[3 * 2 - 1] = (((timing->vdelay >> 8) & 0x03) << 6) |
@@ -159,6 +159,7 @@
client = kmalloc(sizeof(*client), GFP_KERNEL);
if(client == NULL)
return -ENOMEM;
+ memset(client, 0, sizeof(*client));
client_template.adapter = adap;
client_template.addr = addr;
memcpy(client, &client_template, sizeof(*client));
@@ -170,8 +171,8 @@
}
memset(decoder, 0, sizeof(struct bt819));
- strcpy(client->name, "bt819");
- client->data = decoder;
+ strncpy(client->dev.name, "bt819", DEVICE_NAME_SIZE);
+ i2c_set_clientdata(client, decoder);
decoder->client = client;
decoder->addr = addr;
decoder->norm = VIDEO_MODE_NTSC;
@@ -186,10 +187,10 @@
i = bt819_init(client);
if (i < 0) {
printk(KERN_ERR "%s: bt819_attach: init status %d\n",
- decoder->client->name, i);
+ decoder->client->dev.name, i);
} else {
printk(KERN_INFO "%s: bt819_attach: chip version %x\n",
- decoder->client->name, i2c_smbus_read_byte_data(client,
+ decoder->client->dev.name, i2c_smbus_read_byte_data(client,
0x17) & 0x0f);
}
init_MUTEX(&decoder->lock);
@@ -205,7 +206,7 @@
static int bt819_detach(struct i2c_client *client)
{
i2c_detach_client(client);
- kfree(client->data);
+ i2c_get_clientdata(client);
kfree(client);
MOD_DEC_USE_COUNT;
return 0;
@@ -215,7 +216,7 @@
{
int temp;
- struct bt819 *decoder = client->data;
+ struct bt819 *decoder = i2c_get_clientdata(client);
//return 0;
if (!decoder->initialized) { // First call to bt819_init could be
@@ -268,7 +269,7 @@
*iarg = res;
DEBUG(printk(KERN_INFO "%s-bt819: get status %x\n",
- decoder->client->name, *iarg));
+ decoder->client->dev.name, *iarg));
}
break;
@@ -278,7 +279,7 @@
struct timing *timing;
DEBUG(printk(KERN_INFO "%s-bt819: set norm %x\n",
- decoder->client->name, *iarg));
+ decoder->client->dev.name, *iarg));
if (*iarg == VIDEO_MODE_NTSC) {
bt819_setbit(decoder, 0x01, 0, 1);
@@ -319,7 +320,7 @@
int *iarg = arg;
DEBUG(printk(KERN_INFO "%s-bt819: set input %x\n",
- decoder->client->name, *iarg));
+ decoder->client->dev.name, *iarg));
if (*iarg < 0 || *iarg > 7) {
return -EINVAL;
@@ -344,7 +345,7 @@
int *iarg = arg;
DEBUG(printk(KERN_INFO "%s-bt819: set output %x\n",
- decoder->client->name, *iarg));
+ decoder->client->dev.name, *iarg));
/* not much choice of outputs */
if (*iarg != 0) {
@@ -360,7 +361,7 @@
DEBUG(printk
(KERN_INFO "%s-bt819: enable output %x\n",
- decoder->client->name, *iarg));
+ decoder->client->dev.name, *iarg));
if (decoder->enable != enable) {
decoder->enable = enable;
@@ -381,7 +382,7 @@
DEBUG(printk
(KERN_INFO
"%s-bt819: set picture brightness %d contrast %d colour %d\n",
- decoder->client->name, pic->brightness,
+ decoder->client->dev.name, pic->brightness,
pic->contrast, pic->colour));
@@ -448,9 +449,11 @@
};
static struct i2c_client client_template = {
- .name = "bt819_client",
.id = -1,
- .driver = &i2c_driver_bt819
+ .driver = &i2c_driver_bt819,
+ .dev = {
+ .name = "bt819_client",
+ },
};
static int bt819_setup(void)
diff -Nru a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
--- a/drivers/media/video/bt856.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/bt856.c Sun Mar 23 00:11:01 2003
@@ -106,6 +106,7 @@
client = kmalloc(sizeof(*client), GFP_KERNEL);
if(client == NULL)
return -ENOMEM;
+ memset(client, 0, sizeof(*client));
client_template.adapter = adap;
client_template.addr = addr;
memcpy(client, &client_template, sizeof(*client));
@@ -123,14 +124,14 @@
memset(encoder, 0, sizeof(struct bt856));
- strcpy(client->name, "bt856");
+ strncpy(client->dev.name, "bt856", DEVICE_NAME_SIZE);
encoder->client = client;
- client->data = encoder;
+ i2c_set_clientdata(client, encoder);
encoder->addr = client->addr;
encoder->norm = VIDEO_MODE_NTSC;
encoder->enable = 1;
- DEBUG(printk(KERN_INFO "%s-bt856: attach\n", encoder->client->name));
+ DEBUG(printk(KERN_INFO "%s-bt856: attach\n", encoder->client->dev.name));
i2c_smbus_write_byte_data(client, 0xdc, 0x18);
encoder->reg[0xdc] = 0x18;
@@ -171,7 +172,7 @@
static int bt856_detach(struct i2c_client *client)
{
i2c_detach_client(client);
- kfree(client->data);
+ i2c_get_clientdata(client);
kfree(client);
MOD_DEC_USE_COUNT;
return 0;
@@ -180,7 +181,7 @@
static int bt856_command(struct i2c_client *client, unsigned int cmd,
void *arg)
{
- struct bt856 *encoder = client->data;
+ struct bt856 *encoder = i2c_get_clientdata(client);
switch (cmd) {
@@ -190,7 +191,7 @@
DEBUG(printk
(KERN_INFO "%s-bt856: get capabilities\n",
- encoder->client->name));
+ encoder->client->dev.name));
cap->flags
= VIDEO_ENCODER_PAL
@@ -205,7 +206,7 @@
int *iarg = arg;
DEBUG(printk(KERN_INFO "%s-bt856: set norm %d\n",
- encoder->client->name, *iarg));
+ encoder->client->dev.name, *iarg));
switch (*iarg) {
@@ -232,7 +233,7 @@
int *iarg = arg;
DEBUG(printk(KERN_INFO "%s-bt856: set input %d\n",
- encoder->client->name, *iarg));
+ encoder->client->dev.name, *iarg));
/* We only have video bus.
*iarg = 0: input is from bt819
@@ -268,7 +269,7 @@
int *iarg = arg;
DEBUG(printk(KERN_INFO "%s-bt856: set output %d\n",
- encoder->client->name, *iarg));
+ encoder->client->dev.name, *iarg));
/* not much choice of outputs */
if (*iarg != 0) {
@@ -285,7 +286,7 @@
DEBUG(printk
(KERN_INFO "%s-bt856: enable output %d\n",
- encoder->client->name, encoder->enable));
+ encoder->client->dev.name, encoder->enable));
}
break;
@@ -309,9 +310,11 @@
};
static struct i2c_client client_template = {
- .name = "bt856_client",
.id = -1,
- .driver = &i2c_driver_bt856
+ .driver = &i2c_driver_bt856,
+ .dev = {
+ .name = "bt856_client",
+ },
};
static int bt856_init(void)
diff -Nru a/drivers/media/video/bttv-if.c b/drivers/media/video/bttv-if.c
--- a/drivers/media/video/bttv-if.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/bttv-if.c Sun Mar 23 00:11:01 2003
@@ -194,7 +194,7 @@
static int attach_inform(struct i2c_client *client)
{
- struct bttv *btv = (struct bttv*)client->adapter->data;
+ struct bttv *btv = i2c_get_adapdata(client->adapter);
int i;
for (i = 0; i < I2C_CLIENTS_MAX; i++) {
@@ -207,13 +207,13 @@
bttv_call_i2c_clients(btv,TUNER_SET_TYPE,&btv->tuner_type);
if (bttv_verbose)
printk("bttv%d: i2c attach [client=%s,%s]\n",btv->nr,
- client->name, (i < I2C_CLIENTS_MAX) ? "ok" : "failed");
+ client->dev.name, (i < I2C_CLIENTS_MAX) ? "ok" : "failed");
return 0;
}
static int detach_inform(struct i2c_client *client)
{
- struct bttv *btv = (struct bttv*)client->adapter->data;
+ struct bttv *btv = i2c_get_adapdata(client->adapter);
int i;
for (i = 0; i < I2C_CLIENTS_MAX; i++) {
@@ -224,7 +224,7 @@
}
if (bttv_verbose)
printk("bttv%d: i2c detach [client=%s,%s]\n",btv->nr,
- client->name, (i < I2C_CLIENTS_MAX) ? "ok" : "failed");
+ client->dev.name, (i < I2C_CLIENTS_MAX) ? "ok" : "failed");
return 0;
}
@@ -261,15 +261,19 @@
static struct i2c_adapter bttv_i2c_adap_template = {
.owner = THIS_MODULE,
- .name = "bt848",
.id = I2C_HW_B_BT848,
.client_register = attach_inform,
.client_unregister = detach_inform,
+ .dev = {
+ .name = "bt848",
+ },
};
static struct i2c_client bttv_i2c_client_template = {
- .name = "bttv internal use only",
- .id = -1,
+ .id = -1,
+ .dev = {
+ .name = "bttv internal",
+ },
};
@@ -343,10 +347,10 @@
memcpy(&btv->i2c_client, &bttv_i2c_client_template,
sizeof(struct i2c_client));
- sprintf(btv->i2c_adap.name+strlen(btv->i2c_adap.name),
+ sprintf(btv->i2c_adap.dev.name+strlen(btv->i2c_adap.dev.name),
" #%d", btv->nr);
btv->i2c_algo.data = btv;
- btv->i2c_adap.data = btv;
+ i2c_set_adapdata(&btv->i2c_adap, btv);
btv->i2c_adap.algo_data = &btv->i2c_algo;
btv->i2c_client.adapter = &btv->i2c_adap;
diff -Nru a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
--- a/drivers/media/video/msp3400.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/msp3400.c Sun Mar 23 00:11:01 2003
@@ -349,7 +349,7 @@
static void
msp3400c_set_scart(struct i2c_client *client, int in, int out)
{
- struct msp3400c *msp = client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
if (-1 == scarts[out][in])
return;
@@ -411,7 +411,7 @@
static void msp3400c_setmode(struct i2c_client *client, int type)
{
- struct msp3400c *msp = client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
int i;
dprintk("msp3400: setmode: %d\n",type);
@@ -471,7 +471,7 @@
{
static char *strmode[] = { "0", "mono", "stereo", "3",
"lang1", "5", "6", "7", "lang2" };
- struct msp3400c *msp = client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
int nicam=0; /* channel source: FM/AM or nicam */
int src=0;
@@ -599,7 +599,7 @@
static void
msp3400c_restore_dfp(struct i2c_client *client)
{
- struct msp3400c *msp = client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
int i;
for (i = 0; i < DFP_COUNT; i++) {
@@ -627,7 +627,7 @@
static int
autodetect_stereo(struct i2c_client *client)
{
- struct msp3400c *msp = client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
int val;
int newstereo = msp->stereo;
int newnicam = msp->nicam_on;
@@ -727,7 +727,7 @@
/* stereo/multilang monitoring */
static void watch_stereo(struct i2c_client *client)
{
- struct msp3400c *msp = client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
if (autodetect_stereo(client)) {
if (msp->stereo & VIDEO_SOUND_STEREO)
@@ -746,7 +746,7 @@
static int msp3400c_thread(void *data)
{
struct i2c_client *client = data;
- struct msp3400c *msp = client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
struct CARRIER_DETECT *cd;
int count, max1,max2,val1,val2, val,this;
@@ -1002,7 +1002,7 @@
static int msp3410d_thread(void *data)
{
struct i2c_client *client = data;
- struct msp3400c *msp = client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
int mode,val,i,std;
#ifdef CONFIG_SMP
@@ -1226,9 +1226,11 @@
static struct i2c_client client_template =
{
- .name = "(unset)",
.flags = I2C_CLIENT_ALLOW_USE,
.driver = &driver,
+ .dev = {
+ .name = "(unset)",
+ },
};
static int msp_attach(struct i2c_adapter *adap, int addr,
@@ -1265,7 +1267,7 @@
for (i = 0; i < DFP_COUNT; i++)
msp->dfp_regs[i] = -1;
- c->data = msp;
+ i2c_set_clientdata(c, msp);
init_waitqueue_head(&msp->wq);
if (-1 == msp3400c_reset(c)) {
@@ -1291,7 +1293,7 @@
#endif
msp3400c_setvolume(c,msp->muted,msp->left,msp->right);
- sprintf(c->name,"MSP34%02d%c-%c%d",
+ snprintf(c->dev.name, DEVICE_NAME_SIZE, "MSP34%02d%c-%c%d",
(rev2>>8)&0xff, (rev1&0xff)+'@', ((rev1>>8)&0xff)+'@', rev2&0x1f);
msp->nicam = (((rev2>>8)&0xff) != 00) ? 1 : 0;
@@ -1310,7 +1312,7 @@
msp->wake_stereo.data = (unsigned long)msp;
/* hello world :-) */
- printk(KERN_INFO "msp34xx: init: chip=%s",c->name);
+ printk(KERN_INFO "msp34xx: init: chip=%s",c->dev.name);
if (msp->nicam)
printk(", has NICAM support");
printk("\n");
@@ -1340,7 +1342,7 @@
static int msp_detach(struct i2c_client *client)
{
DECLARE_MUTEX_LOCKED(sem);
- struct msp3400c *msp = (struct msp3400c*)client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
int i;
/* shutdown control thread */
@@ -1379,7 +1381,7 @@
static void msp_wake_thread(struct i2c_client *client)
{
- struct msp3400c *msp = (struct msp3400c*)client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
msp3400c_setvolume(client,msp->muted,0,0);
msp->watch_stereo=0;
@@ -1391,7 +1393,7 @@
static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
{
- struct msp3400c *msp = (struct msp3400c*)client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
__u16 *sarg = arg;
#if 0
int *iarg = (int*)arg;
diff -Nru a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
--- a/drivers/media/video/saa5249.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/saa5249.c Sun Mar 23 00:11:01 2003
@@ -171,20 +171,21 @@
return -ENOMEM;
}
memset(t, 0, sizeof(*t));
- strcpy(client->name, IF_NAME);
+ strncpy(client->dev.name, IF_NAME, DEVICE_NAME_SIZE);
init_MUTEX(&t->lock);
/*
* Now create a video4linux device
*/
- client->data = vd=(struct video_device *)kmalloc(sizeof(struct video_device), GFP_KERNEL);
+ vd = (struct video_device *)kmalloc(sizeof(struct video_device), GFP_KERNEL);
if(vd==NULL)
{
kfree(t);
kfree(client);
return -ENOMEM;
}
+ i2c_set_clientdata(client, vd);
memcpy(vd, &saa_template, sizeof(*vd));
for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++)
@@ -234,7 +235,7 @@
static int saa5249_detach(struct i2c_client *client)
{
- struct video_device *vd=client->data;
+ struct video_device *vd = i2c_get_clientdata(client);
i2c_detach_client(client);
video_unregister_device(vd);
kfree(vd->priv);
@@ -264,9 +265,11 @@
};
static struct i2c_client client_template = {
- .name = "(unset)",
.id = -1,
- .driver = &i2c_driver_videotext
+ .driver = &i2c_driver_videotext,
+ .dev = {
+ .name = "(unset)",
+ },
};
/*
diff -Nru a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
--- a/drivers/media/video/saa7110.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/saa7110.c Sun Mar 23 00:11:01 2003
@@ -163,6 +163,7 @@
client=kmalloc(sizeof(*client), GFP_KERNEL);
if(client == NULL)
return -ENOMEM;
+ memset(client, 0, sizeof(*client));
client_template.adapter = adap;
client_template.addr = addr;
memcpy(client, &client_template, sizeof(*client));
@@ -175,9 +176,9 @@
/* clear our private data */
memset(decoder, 0, sizeof(*decoder));
- strcpy(client->name, IF_NAME);
+ strncpy(client->dev.name, IF_NAME, DEVICE_NAME_SIZE);
decoder->client = client;
- client->data = decoder;
+ i2c_set_clientdata(client, decoder);
decoder->addr = addr;
decoder->norm = VIDEO_MODE_PAL;
decoder->input = 0;
@@ -189,7 +190,7 @@
rv = i2c_master_send(client, initseq, sizeof(initseq));
if (rv < 0)
- printk(KERN_ERR "%s_attach: init status %d\n", client->name, rv);
+ printk(KERN_ERR "%s_attach: init status %d\n", client->dev.name, rv);
else {
i2c_smbus_write_byte_data(client,0x21,0x16);
i2c_smbus_write_byte_data(client,0x0D,0x04);
@@ -213,7 +214,7 @@
static
int saa7110_detach(struct i2c_client *client)
{
- struct saa7110* decoder = client->data;
+ struct saa7110* decoder = i2c_get_clientdata(client);
i2c_detach_client(client);
@@ -232,7 +233,7 @@
static
int saa7110_command(struct i2c_client *client, unsigned int cmd, void *arg)
{
- struct saa7110* decoder = client->data;
+ struct saa7110* decoder = i2c_get_clientdata(client);
int v;
switch (cmd) {
@@ -251,7 +252,7 @@
case DECODER_GET_STATUS:
{
- struct saa7110* decoder = client->data;
+ struct saa7110* decoder = i2c_get_clientdata(client);
int status;
int res = 0;
@@ -390,9 +391,11 @@
.command = saa7110_command
};
static struct i2c_client client_template = {
- .name = "saa7110_client",
.id = -1,
- .driver = &i2c_driver_saa7110
+ .driver = &i2c_driver_saa7110,
+ .dev = {
+ .name = "saa7110_client",
+ },
};
static int saa7110_init(void)
diff -Nru a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
--- a/drivers/media/video/saa7111.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/saa7111.c Sun Mar 23 00:11:01 2003
@@ -120,6 +120,7 @@
client = kmalloc(sizeof(*client), GFP_KERNEL);
if(client == NULL)
return -ENOMEM;
+ memset(client, 0, sizeof(*client));
client_template.adapter = adap;
client_template.addr = addr;
memcpy(client, &client_template, sizeof(*client));
@@ -132,9 +133,9 @@
}
memset(decoder, 0, sizeof(*decoder));
- strcpy(client->name, "saa7111");
+ strncpy(client->dev.name, "saa7111", DEVICE_NAME_SIZE);
decoder->client = client;
- client->data = decoder;
+ i2c_set_clientdata(client, decoder);
decoder->addr = addr;
decoder->norm = VIDEO_MODE_NTSC;
decoder->input = 0;
@@ -147,10 +148,10 @@
i = i2c_master_send(client, init, sizeof(init));
if (i < 0) {
printk(KERN_ERR "%s_attach: init status %d\n",
- client->name, i);
+ client->dev.name, i);
} else {
printk(KERN_INFO "%s_attach: chip version %x\n",
- client->name, i2c_smbus_read_byte_data(client, 0x00) >> 4);
+ client->dev.name, i2c_smbus_read_byte_data(client, 0x00) >> 4);
}
init_MUTEX(&decoder->lock);
i2c_attach_client(client);
@@ -164,7 +165,7 @@
static int saa7111_detach(struct i2c_client *client)
{
- struct saa7111 *decoder = client->data;
+ struct saa7111 *decoder = i2c_get_clientdata(client);
i2c_detach_client(client);
kfree(decoder);
kfree(client);
@@ -175,7 +176,7 @@
static int saa7111_command(struct i2c_client *client, unsigned int cmd,
void *arg)
{
- struct saa7111 *decoder = client->data;
+ struct saa7111 *decoder = i2c_get_clientdata(client);
switch (cmd) {
@@ -187,7 +188,7 @@
for (i = 0; i < 32; i += 16) {
int j;
- printk("KERN_DEBUG %s: %03x", client->name,
+ printk("KERN_DEBUG %s: %03x", client->dev.name,
i);
for (j = 0; j < 16; ++j) {
printk(" %02x",
@@ -407,9 +408,11 @@
};
static struct i2c_client client_template = {
- .name = "saa7111_client",
.id = -1,
- .driver = &i2c_driver_saa7111
+ .driver = &i2c_driver_saa7111,
+ .dev = {
+ .name = "saa7111_client",
+ },
};
static int saa7111_init(void)
diff -Nru a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
--- a/drivers/media/video/saa7134/saa7134-i2c.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/saa7134/saa7134-i2c.c Sun Mar 23 00:11:01 2003
@@ -334,15 +334,19 @@
static struct i2c_adapter saa7134_adap_template = {
.owner = THIS_MODULE,
- .name = "saa7134",
.id = I2C_ALGO_SAA7134,
.algo = &saa7134_algo,
.client_register = attach_inform,
+ .dev = {
+ .name = "saa7134",
+ },
};
static struct i2c_client saa7134_client_template = {
- .name = "saa7134 internal",
.id = -1,
+ .dev = {
+ .name = "saa7134 internal",
+ },
};
/* ----------------------------------------------------------- */
@@ -410,7 +414,7 @@
int saa7134_i2c_register(struct saa7134_dev *dev)
{
dev->i2c_adap = saa7134_adap_template;
- strcpy(dev->i2c_adap.name,dev->name);
+ strncpy(dev->i2c_adap.dev.name, dev->name, DEVICE_NAME_SIZE);
dev->i2c_adap.algo_data = dev;
i2c_add_adapter(&dev->i2c_adap);
diff -Nru a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
--- a/drivers/media/video/saa7185.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/saa7185.c Sun Mar 23 00:11:01 2003
@@ -191,6 +191,7 @@
client = kmalloc(sizeof(*client), GFP_KERNEL);
if (client == NULL)
return -ENOMEM;
+ memset(client, 0, sizeof(*client));
client_template.adapter = adap;
client_template.addr = addr;
memcpy(client, &client_template, sizeof(*client));
@@ -202,9 +203,9 @@
memset(encoder, 0, sizeof(*encoder));
- strcpy(client->name, "saa7185");
+ strncpy(client->dev.name, "saa7185", DEVICE_NAME_SIZE);
encoder->client = client;
- client->data = encoder;
+ i2c_set_clientdata(client, encoder);
encoder->addr = addr;
encoder->norm = VIDEO_MODE_NTSC;
encoder->enable = 1;
@@ -215,11 +216,11 @@
sizeof(init_ntsc));
}
if (i < 0) {
- printk(KERN_ERR "%s_attach: init error %d\n", client->name,
+ printk(KERN_ERR "%s_attach: init error %d\n", client->dev.name,
i);
} else {
printk(KERN_INFO "%s_attach: chip version %d\n",
- client->name, i2c_smbus_read_byte(client) >> 5);
+ client->dev.name, i2c_smbus_read_byte(client) >> 5);
}
init_MUTEX(&encoder->lock);
i2c_attach_client(client);
@@ -233,7 +234,7 @@
static int saa7185_detach(struct i2c_client *client)
{
- struct saa7185 *encoder = client->data;
+ struct saa7185 *encoder = i2c_get_clientdata(client);
i2c_detach_client(client);
i2c_smbus_write_byte_data(client, 0x61, (encoder->reg[0x61]) | 0x40); /* SW: output off is active */
//i2c_smbus_write_byte_data(client, 0x3a, (encoder->reg[0x3a]) | 0x80); /* SW: color bar */
@@ -246,7 +247,7 @@
static int saa7185_command(struct i2c_client *client, unsigned int cmd,
void *arg)
{
- struct saa7185 *encoder = client->data;
+ struct saa7185 *encoder = i2c_get_clientdata(client);
switch (cmd) {
@@ -365,9 +366,11 @@
};
static struct i2c_client client_template = {
- .name = "saa7185_client",
.id = -1,
- .driver = &i2c_driver_saa7185
+ .driver = &i2c_driver_saa7185,
+ .dev = {
+ .name = "saa7185_client",
+ },
};
static int saa7185_init(void)
diff -Nru a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
--- a/drivers/media/video/tda7432.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/tda7432.c Sun Mar 23 00:11:01 2003
@@ -260,7 +260,7 @@
static int tda7432_set(struct i2c_client *client)
{
- struct tda7432 *t = client->data;
+ struct tda7432 *t = i2c_get_clientdata(client);
unsigned char buf[16];
d2printk("tda7432: In tda7432_set\n");
@@ -287,7 +287,7 @@
static void do_tda7432_init(struct i2c_client *client)
{
- struct tda7432 *t = client->data;
+ struct tda7432 *t = i2c_get_clientdata(client);
d2printk("tda7432: In tda7432_init\n");
t->input = TDA7432_STEREO_IN | /* Main (stereo) input */
@@ -328,11 +328,11 @@
memcpy(client,&client_template,sizeof(struct i2c_client));
client->adapter = adap;
client->addr = addr;
- client->data = t;
+ i2c_set_clientdata(client, t);
do_tda7432_init(client);
MOD_INC_USE_COUNT;
- strcpy(client->name,"TDA7432");
+ strncpy(client->dev.name, "TDA7432", DEVICE_NAME_SIZE);
printk(KERN_INFO "tda7432: init\n");
i2c_attach_client(client);
@@ -348,7 +348,7 @@
static int tda7432_detach(struct i2c_client *client)
{
- struct tda7432 *t = client->data;
+ struct tda7432 *t = i2c_get_clientdata(client);
do_tda7432_init(client);
i2c_detach_client(client);
@@ -361,7 +361,7 @@
static int tda7432_command(struct i2c_client *client,
unsigned int cmd, void *arg)
{
- struct tda7432 *t = client->data;
+ struct tda7432 *t = i2c_get_clientdata(client);
d2printk("tda7432: In tda7432_command\n");
switch (cmd) {
@@ -526,9 +526,11 @@
static struct i2c_client client_template =
{
- .name = "tda7432",
.id = -1,
.driver = &driver,
+ .dev = {
+ .name = "tda7432",
+ },
};
static int tda7432_init(void)
diff -Nru a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
--- a/drivers/media/video/tda9875.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/tda9875.c Sun Mar 23 00:11:01 2003
@@ -158,7 +158,7 @@
static void tda9875_set(struct i2c_client *client)
{
- struct tda9875 *tda = client->data;
+ struct tda9875 *tda = i2c_get_clientdata(client);
unsigned char a;
dprintk(KERN_DEBUG "tda9875_set(%04x,%04x,%04x,%04x)\n",tda->lvol,tda->rvol,tda->bass,tda->treble);
@@ -176,7 +176,7 @@
static void do_tda9875_init(struct i2c_client *client)
{
- struct tda9875 *t = client->data;
+ struct tda9875 *t = i2c_get_clientdata(client);
dprintk("In tda9875_init\n");
tda9875_write(client, TDA9875_CFG, 0xd0 ); /*reg de config 0 (reset)*/
tda9875_write(client, TDA9875_MSR, 0x03 ); /* Monitor 0b00000XXX*/
@@ -256,7 +256,7 @@
memcpy(client,&client_template,sizeof(struct i2c_client));
client->adapter = adap;
client->addr = addr;
- client->data = t;
+ i2c_set_clientdata(client, t);
if(!tda9875_checkit(adap,addr)) {
kfree(t);
@@ -265,7 +265,7 @@
do_tda9875_init(client);
MOD_INC_USE_COUNT;
- strcpy(client->name,"TDA9875");
+ strncpy(client->dev.name, "TDA9875", DEVICE_NAME_SIZE);
printk(KERN_INFO "tda9875: init\n");
i2c_attach_client(client);
@@ -281,7 +281,7 @@
static int tda9875_detach(struct i2c_client *client)
{
- struct tda9875 *t = client->data;
+ struct tda9875 *t = i2c_get_clientdata(client);
do_tda9875_init(client);
i2c_detach_client(client);
@@ -294,7 +294,7 @@
static int tda9875_command(struct i2c_client *client,
unsigned int cmd, void *arg)
{
- struct tda9875 *t = client->data;
+ struct tda9875 *t = i2c_get_clientdata(client);
dprintk("In tda9875_command...\n");
@@ -396,9 +396,11 @@
static struct i2c_client client_template =
{
- .name = "tda9875",
.id = -1,
.driver = &driver,
+ .dev = {
+ .name = "tda9875",
+ },
};
static int tda9875_init(void)
diff -Nru a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
--- a/drivers/media/video/tda9887.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/tda9887.c Sun Mar 23 00:11:01 2003
@@ -359,7 +359,7 @@
return -ENOMEM;
memset(t,0,sizeof(*t));
t->client = client_template;
- t->client.data = t;
+ i2c_set_clientdata(&t->client, t);
t->pinnacle_id = -1;
i2c_attach_client(&t->client);
@@ -376,12 +376,12 @@
case I2C_ALGO_BIT | I2C_HW_B_RIVA:
case I2C_ALGO_SAA7134:
printk("tda9887: probing %s i2c adapter [id=0x%x]\n",
- adap->name,adap->id);
+ adap->dev.name,adap->id);
rc = i2c_probe(adap, &addr_data, tda9887_attach);
break;
default:
printk("tda9887: ignoring %s i2c adapter [id=0x%x]\n",
- adap->name,adap->id);
+ adap->dev.name,adap->id);
rc = 0;
/* nothing */
}
@@ -390,7 +390,7 @@
static int tda9887_detach(struct i2c_client *client)
{
- struct tda9887 *t = (struct tda9887*)client->data;
+ struct tda9887 *t = i2c_get_clientdata(client);
i2c_detach_client(client);
kfree(t);
@@ -401,7 +401,7 @@
static int
tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
{
- struct tda9887 *t = (struct tda9887*)client->data;
+ struct tda9887 *t = i2c_get_clientdata(client);
switch (cmd) {
@@ -456,9 +456,11 @@
};
static struct i2c_client client_template =
{
- .name = "tda9887",
.flags = I2C_CLIENT_ALLOW_USE,
.driver = &driver,
+ .dev = {
+ .name = "tda9887",
+ },
};
static int tda9887_init_module(void)
diff -Nru a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
--- a/drivers/media/video/tuner-3036.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/tuner-3036.c Sun Mar 23 00:11:01 2003
@@ -196,9 +196,11 @@
static struct i2c_client client_template =
{
- .name = "SAB3036",
.id = -1,
- .driver = &i2c_driver_tuner
+ .driver = &i2c_driver_tuner,
+ .dev = {
+ .name = "SAB3036",
+ },
};
int __init
diff -Nru a/drivers/media/video/tuner.c b/drivers/media/video/tuner.c
--- a/drivers/media/video/tuner.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/tuner.c Sun Mar 23 00:11:01 2003
@@ -226,7 +226,7 @@
{
unsigned char byte;
- struct tuner *t = (struct tuner*)c->data;
+ struct tuner *t = i2c_get_clientdata(c);
if (t->type == TUNER_MT2032)
return 0;
@@ -276,7 +276,7 @@
{
unsigned char buf[21];
int ret,xogc,xok=0;
- struct tuner *t = (struct tuner*)c->data;
+ struct tuner *t = i2c_get_clientdata(c);
buf[0]=0;
ret=i2c_master_send(c,buf,1);
@@ -517,7 +517,7 @@
{
unsigned char buf[21];
int lint_try,ret,sel,lock=0;
- struct tuner *t = (struct tuner*)c->data;
+ struct tuner *t = i2c_get_clientdata(c);
dprintk("mt2032_set_if_freq rfin=%d if1=%d if2=%d from=%d to=%d\n",rfin,if1,if2,from,to);
@@ -594,7 +594,7 @@
u8 config;
u16 div;
struct tunertype *tun;
- struct tuner *t = c->data;
+ struct tuner *t = i2c_get_clientdata(c);
unsigned char buffer[4];
int rc;
@@ -733,7 +733,7 @@
static void set_radio_freq(struct i2c_client *c, int freq)
{
struct tunertype *tun;
- struct tuner *t = (struct tuner*)c->data;
+ struct tuner *t = i2c_get_clientdata(c);
unsigned char buffer[4];
int rc,div;
@@ -794,16 +794,17 @@
if (NULL == (client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL)))
return -ENOMEM;
memcpy(client,&client_template,sizeof(struct i2c_client));
- client->data = t = kmalloc(sizeof(struct tuner),GFP_KERNEL);
+ t = kmalloc(sizeof(struct tuner),GFP_KERNEL);
if (NULL == t) {
kfree(client);
return -ENOMEM;
}
+ i2c_set_clientdata(client, t);
memset(t,0,sizeof(struct tuner));
if (type >= 0 && type < TUNERS) {
t->type = type;
printk("tuner(bttv): type forced to %d (%s) [insmod]\n",t->type,tuners[t->type].name);
- strncpy(client->name, tuners[t->type].name, sizeof(client->name));
+ strncpy(client->dev.name, tuners[t->type].name, DEVICE_NAME_SIZE);
} else {
t->type = -1;
}
@@ -830,12 +831,12 @@
case I2C_ALGO_SAA7134:
case I2C_ALGO_SAA7146:
printk("tuner: probing %s i2c adapter [id=0x%x]\n",
- adap->name,adap->id);
+ adap->dev.name,adap->id);
rc = i2c_probe(adap, &addr_data, tuner_attach);
break;
default:
printk("tuner: ignoring %s i2c adapter [id=0x%x]\n",
- adap->name,adap->id);
+ adap->dev.name,adap->id);
rc = 0;
/* nothing */
}
@@ -844,7 +845,7 @@
static int tuner_detach(struct i2c_client *client)
{
- struct tuner *t = (struct tuner*)client->data;
+ struct tuner *t = i2c_get_clientdata(client);
i2c_detach_client(client);
kfree(t);
@@ -856,7 +857,7 @@
static int
tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
{
- struct tuner *t = (struct tuner*)client->data;
+ struct tuner *t = i2c_get_clientdata(client);
int *iarg = (int*)arg;
#if 0
__u16 *sarg = (__u16*)arg;
@@ -875,7 +876,7 @@
t->type = *iarg;
printk("tuner: type set to %d (%s)\n",
t->type,tuners[t->type].name);
- strncpy(client->name, tuners[t->type].name, sizeof(client->name));
+ strncpy(client->dev.name, tuners[t->type].name, DEVICE_NAME_SIZE);
if (t->type == TUNER_MT2032)
mt2032_init(client);
break;
@@ -977,9 +978,11 @@
};
static struct i2c_client client_template =
{
- .name = "(tuner unset)",
.flags = I2C_CLIENT_ALLOW_USE,
.driver = &driver,
+ .dev = {
+ .name = "(tuner unset)",
+ },
};
static int tuner_init_module(void)
diff -Nru a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
--- a/drivers/media/video/tvaudio.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/tvaudio.c Sun Mar 23 00:11:01 2003
@@ -161,22 +161,22 @@
unsigned char buffer[2];
if (-1 == subaddr) {
- dprintk("%s: chip_write: 0x%x\n", chip->c.name, val);
+ dprintk("%s: chip_write: 0x%x\n", chip->c.dev.name, val);
chip->shadow.bytes[1] = val;
buffer[0] = val;
if (1 != i2c_master_send(&chip->c,buffer,1)) {
printk(KERN_WARNING "%s: I/O error (write 0x%x)\n",
- chip->c.name, val);
+ chip->c.dev.name, val);
return -1;
}
} else {
- dprintk("%s: chip_write: reg%d=0x%x\n", chip->c.name, subaddr, val);
+ dprintk("%s: chip_write: reg%d=0x%x\n", chip->c.dev.name, subaddr, val);
chip->shadow.bytes[subaddr+1] = val;
buffer[0] = subaddr;
buffer[1] = val;
if (2 != i2c_master_send(&chip->c,buffer,2)) {
printk(KERN_WARNING "%s: I/O error (write reg%d=0x%x)\n",
- chip->c.name, subaddr, val);
+ chip->c.dev.name, subaddr, val);
return -1;
}
}
@@ -201,10 +201,10 @@
if (1 != i2c_master_recv(&chip->c,&buffer,1)) {
printk(KERN_WARNING "%s: I/O error (read)\n",
- chip->c.name);
+ chip->c.dev.name);
return -1;
}
- dprintk("%s: chip_read: 0x%x\n",chip->c.name,buffer);
+ dprintk("%s: chip_read: 0x%x\n",chip->c.dev.name,buffer);
return buffer;
}
@@ -220,11 +220,11 @@
if (2 != i2c_transfer(chip->c.adapter,msgs,2)) {
printk(KERN_WARNING "%s: I/O error (read2)\n",
- chip->c.name);
+ chip->c.dev.name);
return -1;
}
dprintk("%s: chip_read2: reg%d=0x%x\n",
- chip->c.name,subaddr,read[0]);
+ chip->c.dev.name,subaddr,read[0]);
return read[0];
}
@@ -237,7 +237,7 @@
/* update our shadow register set; print bytes if (debug > 0) */
dprintk("%s: chip_cmd(%s): reg=%d, data:",
- chip->c.name,name,cmd->bytes[0]);
+ chip->c.dev.name,name,cmd->bytes[0]);
for (i = 1; i < cmd->count; i++) {
dprintk(" 0x%x",cmd->bytes[i]);
chip->shadow.bytes[i+cmd->bytes[0]] = cmd->bytes[i];
@@ -246,7 +246,7 @@
/* send data to the chip */
if (cmd->count != i2c_master_send(&chip->c,cmd->bytes,cmd->count)) {
- printk(KERN_WARNING "%s: I/O error (%s)\n", chip->c.name, name);
+ printk(KERN_WARNING "%s: I/O error (%s)\n", chip->c.dev.name, name);
return -1;
}
return 0;
@@ -273,19 +273,19 @@
#ifdef CONFIG_SMP
lock_kernel();
#endif
- daemonize("%s", chip->c.name);
+ daemonize("%s", chip->c.dev.name);
chip->thread = current;
#ifdef CONFIG_SMP
unlock_kernel();
#endif
- dprintk("%s: thread started\n", chip->c.name);
+ dprintk("%s: thread started\n", chip->c.dev.name);
if(chip->notify != NULL)
up(chip->notify);
for (;;) {
interruptible_sleep_on(&chip->wq);
- dprintk("%s: thread wakeup\n", chip->c.name);
+ dprintk("%s: thread wakeup\n", chip->c.dev.name);
if (chip->done || signal_pending(current))
break;
@@ -301,7 +301,7 @@
}
chip->thread = NULL;
- dprintk("%s: thread exiting\n", chip->c.name);
+ dprintk("%s: thread exiting\n", chip->c.dev.name);
if(chip->notify != NULL)
up(chip->notify);
@@ -316,7 +316,7 @@
if (mode == chip->prevmode)
return;
- dprintk("%s: thread checkmode\n", chip->c.name);
+ dprintk("%s: thread checkmode\n", chip->c.dev.name);
chip->prevmode = mode;
if (mode & VIDEO_SOUND_STEREO)
@@ -1339,7 +1339,7 @@
memcpy(&chip->c,&client_template,sizeof(struct i2c_client));
chip->c.adapter = adap;
chip->c.addr = addr;
- chip->c.data = chip;
+ i2c_set_clientdata(&chip->c, chip);
/* find description for the chip */
dprintk("tvaudio: chip found @ i2c-addr=0x%x\n", addr<<1);
@@ -1364,7 +1364,7 @@
(desc->flags & CHIP_HAS_INPUTSEL) ? " audiomux" : "");
/* fill required data structures */
- strcpy(chip->c.name,desc->name);
+ strncpy(chip->c.dev.name, desc->name, DEVICE_NAME_SIZE);
chip->type = desc-chiplist;
chip->shadow.count = desc->registers+1;
chip->prevmode = -1;
@@ -1421,7 +1421,7 @@
static int chip_detach(struct i2c_client *client)
{
- struct CHIPSTATE *chip = client->data;
+ struct CHIPSTATE *chip = i2c_get_clientdata(client);
del_timer(&chip->wt);
if (NULL != chip->thread) {
@@ -1447,10 +1447,10 @@
unsigned int cmd, void *arg)
{
__u16 *sarg = arg;
- struct CHIPSTATE *chip = client->data;
+ struct CHIPSTATE *chip = i2c_get_clientdata(client);
struct CHIPDESC *desc = chiplist + chip->type;
- dprintk("%s: chip_command 0x%x\n",chip->c.name,cmd);
+ dprintk("%s: chip_command 0x%x\n",chip->c.dev.name,cmd);
switch (cmd) {
case AUDC_SET_INPUT:
@@ -1558,9 +1558,11 @@
static struct i2c_client client_template =
{
- .name = "(unset)",
.flags = I2C_CLIENT_ALLOW_USE,
.driver = &driver,
+ .dev = {
+ .name = "(unset)",
+ },
};
static int audiochip_init_module(void)
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] Yet more i2c driver changes for 2.5.65
2005-05-19 6:23 ` Greg KH
@ 2005-05-19 6:23 ` Greg KH
-1 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2003-03-23 8:14 UTC (permalink / raw)
To: linux-kernel, sensors
ChangeSet 1.889.354.15, 2003/03/22 23:26:58-08:00, greg@kroah.com
i2c: fix up drivers/acorn/char/i2c.c due to previous i2c changes
I'm not going to touch the other driver in this directory, as it will
need more than just minor fixups to get correct.
diff -Nru a/drivers/acorn/char/i2c.c b/drivers/acorn/char/i2c.c
--- a/drivers/acorn/char/i2c.c Sun Mar 23 00:10:55 2003
+++ b/drivers/acorn/char/i2c.c Sun Mar 23 00:10:55 2003
@@ -303,11 +303,13 @@
}
static struct i2c_adapter ioc_ops = {
- .name = "IOC/IOMD",
.id = I2C_HW_B_IOC,
.algo_data = &ioc_data,
.client_register = ioc_client_reg,
.client_unregister = ioc_client_unreg
+ .dev = {
+ .name = "IOC/IOMD",
+ },
};
static int __init i2c_ioc_init(void)
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] Yet more i2c driver changes for 2.5.65
2005-05-19 6:23 ` Greg KH
@ 2005-05-19 6:23 ` Greg KH
-1 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2003-03-23 8:14 UTC (permalink / raw)
To: linux-kernel, sensors
ChangeSet 1.889.354.16, 2003/03/22 23:29:40-08:00, greg@kroah.com
i2c: fix up drivers/ieee1394/pcilynx.c due to previous i2c changes.
diff -Nru a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c
--- a/drivers/ieee1394/pcilynx.c Sun Mar 23 00:10:49 2003
+++ b/drivers/ieee1394/pcilynx.c Sun Mar 23 00:10:49 2003
@@ -138,10 +138,12 @@
};
static struct i2c_adapter bit_ops = {
- .name = "PCILynx I2C adapter",
.id = 0xAA, //FIXME: probably we should get an id in i2c-id.h
.client_register = bit_reg,
.client_unregister = bit_unreg,
+ .dev = {
+ .name = "PCILynx I2C",
+ },
};
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] Yet more i2c driver changes for 2.5.65
2005-05-19 6:23 ` Greg KH
@ 2005-05-19 6:23 ` Greg KH
-1 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2003-03-23 8:15 UTC (permalink / raw)
To: linux-kernel, sensors
ChangeSet 1.987, 2003/03/23 00:06:48-08:00, greg@kroah.com
i2c: fix up drivers/video/matrox/i2c-matroxfb.c due to previous i2c changes
diff -Nru a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matroxfb.c
--- a/drivers/video/matrox/i2c-matroxfb.c Sun Mar 23 00:10:43 2003
+++ b/drivers/video/matrox/i2c-matroxfb.c Sun Mar 23 00:10:43 2003
@@ -111,7 +111,8 @@
b->mask.data = data;
b->mask.clock = clock;
b->adapter = matrox_i2c_adapter_template;
- sprintf(b->adapter.name, name, minor(minfo->fbcon.node));
+ snprintf(b->adapter.dev.name, DEVICE_NAME_SIZE, name,
+ minor(minfo->fbcon.node));
b->adapter.data = b;
b->adapter.algo_data = &b->bac;
b->bac = matrox_i2c_algo_template;
@@ -159,22 +160,22 @@
switch (ACCESS_FBINFO(chip)) {
case MGA_2064:
case MGA_2164:
- err = i2c_bus_reg(&m2info->ddc1, minfo, DDC1B_DATA, DDC1B_CLK, "DDC:fb%u #0 on i2c-matroxfb");
+ err = i2c_bus_reg(&m2info->ddc1, minfo, DDC1B_DATA, DDC1B_CLK, "DDC:fb%u #0");
break;
default:
- err = i2c_bus_reg(&m2info->ddc1, minfo, DDC1_DATA, DDC1_CLK, "DDC:fb%u #0 on i2c-matroxfb");
+ err = i2c_bus_reg(&m2info->ddc1, minfo, DDC1_DATA, DDC1_CLK, "DDC:fb%u #0");
break;
}
if (err)
goto fail_ddc1;
if (ACCESS_FBINFO(devflags.dualhead)) {
- err = i2c_bus_reg(&m2info->ddc2, minfo, DDC2_DATA, DDC2_CLK, "DDC:fb%u #1 on i2c-matroxfb");
+ err = i2c_bus_reg(&m2info->ddc2, minfo, DDC2_DATA, DDC2_CLK, "DDC:fb%u #1");
if (err == -ENODEV) {
printk(KERN_INFO "i2c-matroxfb: VGA->TV plug detected, DDC unavailable.\n");
} else if (err)
printk(KERN_INFO "i2c-matroxfb: Could not register secondary output i2c bus. Continuing anyway.\n");
/* Register maven bus even on G450/G550 */
- err = i2c_bus_reg(&m2info->maven, minfo, MAT_DATA, MAT_CLK, "MAVEN:fb%u on i2c-matroxfb");
+ err = i2c_bus_reg(&m2info->maven, minfo, MAT_DATA, MAT_CLK, "MAVEN:fb%u");
if (err)
printk(KERN_INFO "i2c-matroxfb: Could not register Maven i2c bus. Continuing anyway.\n");
}
^ permalink raw reply [flat|nested] 20+ messages in thread
* [BK PATCH] Yet more i2c driver changes for 2.5.69
2005-05-19 6:23 ` Greg KH
@ 2005-05-19 6:23 ` Greg KH
-1 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2003-05-19 23:11 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel, sensors
Hi,
Here are yet more minor i2c fixups for 2.5.69. They add another i2c bus
driver, and fix some bugs in the existing drivers (i287 and i2c-dev.)
Please pull from: bk://kernel.bkbits.net/gregkh/linux/i2c-2.5
thanks,
greg k-h
drivers/i2c/busses/Kconfig | 25 ++
drivers/i2c/busses/Makefile | 1
drivers/i2c/busses/i2c-piix4.c | 4
drivers/i2c/busses/i2c-sis96x.c | 376 ++++++++++++++++++++++++++++++++++++++++
drivers/i2c/chips/it87.c | 1
drivers/i2c/i2c-dev.c | 228 +++++++++++++++++-------
drivers/pci/quirks.c | 80 ++++++++
include/linux/i2c-id.h | 2
include/linux/pci_ids.h | 3
9 files changed, 648 insertions(+), 72 deletions(-)
-----
<mhoffman:lightlink.com>:
o i2c: Add SiS96x I2C/SMBus driver
<warp:mercury.d2dc.net>:
o I2C: And yet another it87 patch
Greg Kroah-Hartman:
o i2c: fix up i2c-dev driver based on previous core changes
o i2c: piix4 driver: turn common error message to a debug level and rename the sysfs driver name
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] Yet more i2c driver changes for 2.5.69
2005-05-19 6:23 ` Greg KH
@ 2005-05-19 6:23 ` Greg KH
-1 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2003-05-19 23:12 UTC (permalink / raw)
To: linux-kernel, sensors
ChangeSet 1.1093.2.3, 2003/05/19 10:37:20-07:00, warp@mercury.d2dc.net
[PATCH] I2C: And yet another it87 patch.
Trivial, but important.
Somehow in the patching the bk tree somehow got two memset's to clear
new_client in it87_detect, normally while this would be bad, it would
not be critical.
However one of the two happens BEFORE the variable is set, and thus
things go badly.
drivers/i2c/chips/it87.c | 1 -
1 files changed, 1 deletion(-)
diff -Nru a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c
--- a/drivers/i2c/chips/it87.c Mon May 19 15:58:52 2003
+++ b/drivers/i2c/chips/it87.c Mon May 19 15:58:52 2003
@@ -630,7 +630,6 @@
}
}
}
- memset (new_client, 0x00, sizeof(struct i2c_client) + sizeof(struct it87_data));
/* OK. For now, we presume we have a valid client. We now create the
client structure, even though we cannot fill it completely yet.
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH] Yet more i2c driver changes for 2.5.69
2005-05-19 6:23 ` Greg KH
@ 2005-05-19 6:23 ` Greg KH
-1 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2003-05-19 23:12 UTC (permalink / raw)
To: linux-kernel, sensors
ChangeSet 1.1093.2.1, 2003/05/13 12:33:20-07:00, greg@kroah.com
[PATCH] i2c: piix4 driver: turn common error message to a debug level and rename the sysfs driver name.
drivers/i2c/busses/i2c-piix4.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff -Nru a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
--- a/drivers/i2c/busses/i2c-piix4.c Mon May 19 15:59:14 2003
+++ b/drivers/i2c/busses/i2c-piix4.c Mon May 19 15:59:14 2003
@@ -269,7 +269,7 @@
if (temp & 0x04) {
result = -1;
- dev_err(&piix4_adapter.dev, "Error: no response!\n");
+ dev_dbg(&piix4_adapter.dev, "Error: no response!\n");
}
if (inb_p(SMBHSTSTS) != 0x00)
@@ -467,7 +467,7 @@
static struct pci_driver piix4_driver = {
- .name = "piix4 smbus",
+ .name = "piix4-smbus",
.id_table = piix4_ids,
.probe = piix4_probe,
.remove = __devexit_p(piix4_remove),
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] Yet more i2c driver changes for 2.5.69
2005-05-19 6:23 ` Greg KH
@ 2005-05-19 6:23 ` Greg KH
-1 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2003-05-19 23:12 UTC (permalink / raw)
To: linux-kernel, sensors
ChangeSet 1.1093.2.2, 2003/05/13 13:48:50-07:00, mhoffman@lightlink.com
[PATCH] i2c: Add SiS96x I2C/SMBus driver
This patch adds support for the SMBus of SiS96x south
bridges. It is based on i2c-sis645.c from the lm sensors
project, which never made it into an official kernel and
was anyway mis-named.
This driver works on my SiS 645/961 board vs w83781d.
drivers/i2c/busses/Kconfig | 25 ++
drivers/i2c/busses/Makefile | 1
drivers/i2c/busses/i2c-sis96x.c | 376 ++++++++++++++++++++++++++++++++++++++++
drivers/pci/quirks.c | 40 ++++
include/linux/i2c-id.h | 2
include/linux/pci_ids.h | 3
6 files changed, 446 insertions(+), 1 deletion(-)
diff -Nru a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
--- a/drivers/i2c/busses/Kconfig Mon May 19 15:59:03 2003
+++ b/drivers/i2c/busses/Kconfig Mon May 19 15:59:03 2003
@@ -117,6 +117,31 @@
http://www.lm-sensors.nu
+config I2C_SIS96X
+ tristate " SiS 96x"
+ depends on I2C && PCI && EXPERIMENTAL
+ help
+ If you say yes to this option, support will be included for the SiS
+ 96x SMBus (a subset of I2C) interfaces. Specifically, the following
+ chipsets are supported:
+ 645/961
+ 645DX/961
+ 645DX/962
+ 648/961
+ 650/961
+ 735
+
+ This can also be built as a module which can be inserted and removed
+ while the kernel is running. If you want to compile it as a module,
+ say M here and read <file:Documentation/modules.txt>.
+
+ The module will be called i2c-sis96x.
+
+ You will also need the latest user-space utilties: you can find them
+ in the lm_sensors package, which you can download at
+ http://www.lm-sensors.nu
+
+
config I2C_VIAPRO
tristate " VIA 82C596/82C686/823x"
depends on I2C && PCI && EXPERIMENTAL
diff -Nru a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
--- a/drivers/i2c/busses/Makefile Mon May 19 15:59:03 2003
+++ b/drivers/i2c/busses/Makefile Mon May 19 15:59:03 2003
@@ -8,4 +8,5 @@
obj-$(CONFIG_I2C_I801) += i2c-i801.o
obj-$(CONFIG_I2C_ISA) += i2c-isa.o
obj-$(CONFIG_I2C_PIIX4) += i2c-piix4.o
+obj-$(CONFIG_I2C_SIS96X) += i2c-sis96x.o
obj-$(CONFIG_I2C_VIAPRO) += i2c-viapro.o
diff -Nru a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c
--- /dev/null Wed Dec 31 16:00:00 1969
+++ b/drivers/i2c/busses/i2c-sis96x.c Mon May 19 15:59:03 2003
@@ -0,0 +1,376 @@
+/*
+ sis96x.c - Part of lm_sensors, Linux kernel modules for hardware
+ monitoring
+
+ Copyright (c) 2003 Mark M. Hoffman <mhoffman@lightlink.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+/*
+ This module must be considered BETA unless and until
+ the chipset manufacturer releases a datasheet.
+ The register definitions are based on the SiS630.
+
+ This module relies on quirk_sis_96x_smbus (drivers/pci/quirks.c)
+ for just about every machine for which users have reported.
+ If this module isn't detecting your 96x south bridge, have a
+ look there.
+
+ We assume there can only be one SiS96x with one SMBus interface.
+*/
+
+/* #define DEBUG */
+
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/kernel.h>
+#include <linux/stddef.h>
+#include <linux/sched.h>
+#include <linux/ioport.h>
+#include <linux/i2c.h>
+#include <linux/init.h>
+#include <asm/io.h>
+
+/*
+ HISTORY:
+ 2003-05-11 1.0.0 Updated from lm_sensors project for kernel 2.5
+ (was i2c-sis645.c from lm_sensors 2.7.0)
+*/
+#define SIS96x_VERSION "1.0.0"
+
+/* SiS96x SMBus PCI device ID */
+#define PCI_DEVICE_ID_SI_SMBUS 0x16
+
+/* base address register in PCI config space */
+#define SIS96x_BAR 0x04
+
+/* SiS96x SMBus registers */
+#define SMB_STS 0x00
+#define SMB_EN 0x01
+#define SMB_CNT 0x02
+#define SMB_HOST_CNT 0x03
+#define SMB_ADDR 0x04
+#define SMB_CMD 0x05
+#define SMB_PCOUNT 0x06
+#define SMB_COUNT 0x07
+#define SMB_BYTE 0x08
+#define SMB_DEV_ADDR 0x10
+#define SMB_DB0 0x11
+#define SMB_DB1 0x12
+#define SMB_SAA 0x13
+
+/* register count for request_region */
+#define SMB_IOSIZE 0x20
+
+/* Other settings */
+#define MAX_TIMEOUT 500
+
+/* SiS96x SMBus constants */
+#define SIS96x_QUICK 0x00
+#define SIS96x_BYTE 0x01
+#define SIS96x_BYTE_DATA 0x02
+#define SIS96x_WORD_DATA 0x03
+#define SIS96x_PROC_CALL 0x04
+#define SIS96x_BLOCK_DATA 0x05
+
+static struct i2c_adapter sis96x_adapter;
+static u16 sis96x_smbus_base = 0;
+
+static inline u8 sis96x_read(u8 reg)
+{
+ return inb(sis96x_smbus_base + reg) ;
+}
+
+static inline void sis96x_write(u8 reg, u8 data)
+{
+ outb(data, sis96x_smbus_base + reg) ;
+}
+
+/* Internally used pause function */
+static void sis96x_do_pause(unsigned int amount)
+{
+ current->state = TASK_INTERRUPTIBLE;
+ schedule_timeout(amount);
+}
+
+/* Execute a SMBus transaction.
+ int size is from SIS96x_QUICK to SIS96x_BLOCK_DATA
+ */
+static int sis96x_transaction(int size)
+{
+ int temp;
+ int result = 0;
+ int timeout = 0;
+
+ dev_dbg(&sis96x_adapter.dev, "SMBus transaction %d\n", size);
+
+ /* Make sure the SMBus host is ready to start transmitting */
+ if (((temp = sis96x_read(SMB_CNT)) & 0x03) != 0x00) {
+
+ dev_dbg(&sis96x_adapter.dev, "SMBus busy (0x%02x). "
+ "Resetting...\n", temp);
+
+ /* kill the transaction */
+ sis96x_write(SMB_HOST_CNT, 0x20);
+
+ /* check it again */
+ if (((temp = sis96x_read(SMB_CNT)) & 0x03) != 0x00) {
+ dev_dbg(&sis96x_adapter.dev, "Failed (0x%02x)\n", temp);
+ return -1;
+ } else {
+ dev_dbg(&sis96x_adapter.dev, "Successful\n");
+ }
+ }
+
+ /* Turn off timeout interrupts, set fast host clock */
+ sis96x_write(SMB_CNT, 0x20);
+
+ /* clear all (sticky) status flags */
+ temp = sis96x_read(SMB_STS);
+ sis96x_write(SMB_STS, temp & 0x1e);
+
+ /* start the transaction by setting bit 4 and size bits */
+ sis96x_write(SMB_HOST_CNT, 0x10 | (size & 0x07));
+
+ /* We will always wait for a fraction of a second! */
+ do {
+ sis96x_do_pause(1);
+ temp = sis96x_read(SMB_STS);
+ } while (!(temp & 0x0e) && (timeout++ < MAX_TIMEOUT));
+
+ /* If the SMBus is still busy, we give up */
+ if (timeout >= MAX_TIMEOUT) {
+ dev_dbg(&sis96x_adapter.dev, "SMBus Timeout! (0x%02x)\n", temp);
+ result = -1;
+ }
+
+ /* device error - probably missing ACK */
+ if (temp & 0x02) {
+ dev_dbg(&sis96x_adapter.dev, "Failed bus transaction!\n");
+ result = -1;
+ }
+
+ /* bus collision */
+ if (temp & 0x04) {
+ dev_dbg(&sis96x_adapter.dev, "Bus collision!\n");
+ result = -1;
+ }
+
+ /* Finish up by resetting the bus */
+ sis96x_write(SMB_STS, temp);
+ if ((temp = sis96x_read(SMB_STS))) {
+ dev_dbg(&sis96x_adapter.dev, "Failed reset at "
+ "end of transaction! (0x%02x)\n", temp);
+ }
+
+ return result;
+}
+
+/* Return -1 on error. */
+static s32 sis96x_access(struct i2c_adapter * adap, u16 addr,
+ unsigned short flags, char read_write,
+ u8 command, int size, union i2c_smbus_data * data)
+{
+
+ switch (size) {
+ case I2C_SMBUS_QUICK:
+ sis96x_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01));
+ size = SIS96x_QUICK;
+ break;
+
+ case I2C_SMBUS_BYTE:
+ sis96x_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01));
+ if (read_write == I2C_SMBUS_WRITE)
+ sis96x_write(SMB_CMD, command);
+ size = SIS96x_BYTE;
+ break;
+
+ case I2C_SMBUS_BYTE_DATA:
+ sis96x_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01));
+ sis96x_write(SMB_CMD, command);
+ if (read_write == I2C_SMBUS_WRITE)
+ sis96x_write(SMB_BYTE, data->byte);
+ size = SIS96x_BYTE_DATA;
+ break;
+
+ case I2C_SMBUS_PROC_CALL:
+ case I2C_SMBUS_WORD_DATA:
+ sis96x_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01));
+ sis96x_write(SMB_CMD, command);
+ if (read_write == I2C_SMBUS_WRITE) {
+ sis96x_write(SMB_BYTE, data->word & 0xff);
+ sis96x_write(SMB_BYTE + 1, (data->word & 0xff00) >> 8);
+ }
+ size = (size == I2C_SMBUS_PROC_CALL ?
+ SIS96x_PROC_CALL : SIS96x_WORD_DATA);
+ break;
+
+ case I2C_SMBUS_BLOCK_DATA:
+ /* TO DO: */
+ dev_info(&adap->dev, "SMBus block not implemented!\n");
+ return -1;
+ break;
+
+ default:
+ dev_info(&adap->dev, "Unsupported I2C size\n");
+ return -1;
+ break;
+ }
+
+ if (sis96x_transaction(size))
+ return -1;
+
+ if ((size != SIS96x_PROC_CALL) &&
+ ((read_write == I2C_SMBUS_WRITE) || (size == SIS96x_QUICK)))
+ return 0;
+
+ switch (size) {
+ case SIS96x_BYTE:
+ case SIS96x_BYTE_DATA:
+ data->byte = sis96x_read(SMB_BYTE);
+ break;
+
+ case SIS96x_WORD_DATA:
+ case SIS96x_PROC_CALL:
+ data->word = sis96x_read(SMB_BYTE) +
+ (sis96x_read(SMB_BYTE + 1) << 8);
+ break;
+ }
+ return 0;
+}
+
+static u32 sis96x_func(struct i2c_adapter *adapter)
+{
+ return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
+ I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |
+ I2C_FUNC_SMBUS_PROC_CALL;
+}
+
+static struct i2c_algorithm smbus_algorithm = {
+ .name = "Non-I2C SMBus adapter",
+ .id = I2C_ALGO_SMBUS,
+ .smbus_xfer = sis96x_access,
+ .functionality = sis96x_func,
+};
+
+static struct i2c_adapter sis96x_adapter = {
+ .owner = THIS_MODULE,
+ .id = I2C_ALGO_SMBUS | I2C_HW_SMBUS_SIS96X,
+ .class = I2C_ADAP_CLASS_SMBUS,
+ .algo = &smbus_algorithm,
+ .dev = {
+ .name ="unset",
+ },
+};
+
+static struct pci_device_id sis96x_ids[] __devinitdata = {
+
+ {
+ .vendor = PCI_VENDOR_ID_SI,
+ .device = PCI_DEVICE_ID_SI_SMBUS,
+ .subvendor = PCI_ANY_ID,
+ .subdevice = PCI_ANY_ID,
+ },
+
+ { 0, }
+};
+
+static int __devinit sis96x_probe(struct pci_dev *dev,
+ const struct pci_device_id *id)
+{
+ u16 ww = 0;
+ int retval;
+
+ if (sis96x_smbus_base) {
+ dev_err(&dev->dev, "Only one device supported.\n");
+ return -EBUSY;
+ }
+
+ pci_read_config_word(dev, PCI_CLASS_DEVICE, &ww);
+ if (PCI_CLASS_SERIAL_SMBUS != ww) {
+ dev_err(&dev->dev, "Unsupported device class 0x%04x!\n", ww);
+ return -ENODEV;
+ }
+
+ sis96x_smbus_base = pci_resource_start(dev, SIS96x_BAR);
+ if (!sis96x_smbus_base) {
+ dev_err(&dev->dev, "SiS96x SMBus base address "
+ "not initialized!\n");
+ return -EINVAL;
+ }
+ dev_info(&dev->dev, "SiS96x SMBus base address: 0x%04x\n",
+ sis96x_smbus_base);
+
+ /* Everything is happy, let's grab the memory and set things up. */
+ if (!request_region(sis96x_smbus_base, SMB_IOSIZE, "sis96x-smbus")) {
+ dev_err(&dev->dev, "SMBus registers 0x%04x-0x%04x "
+ "already in use!\n", sis96x_smbus_base,
+ sis96x_smbus_base + SMB_IOSIZE - 1);
+
+ sis96x_smbus_base = 0;
+ return -EINVAL;
+ }
+
+ /* set up the driverfs linkage to our parent device */
+ sis96x_adapter.dev.parent = &dev->dev;
+
+ snprintf(sis96x_adapter.dev.name, DEVICE_NAME_SIZE,
+ "SiS96x SMBus adapter at 0x%04x", sis96x_smbus_base);
+
+ if ((retval = i2c_add_adapter(&sis96x_adapter))) {
+ dev_err(&dev->dev, "Couldn't register adapter!\n");
+ release_region(sis96x_smbus_base, SMB_IOSIZE);
+ sis96x_smbus_base = 0;
+ }
+
+ return retval;
+}
+
+static void __devexit sis96x_remove(struct pci_dev *dev)
+{
+ if (sis96x_smbus_base) {
+ i2c_del_adapter(&sis96x_adapter);
+ release_region(sis96x_smbus_base, SMB_IOSIZE);
+ sis96x_smbus_base = 0;
+ }
+}
+
+static struct pci_driver sis96x_driver = {
+ .name = "sis96x smbus",
+ .id_table = sis96x_ids,
+ .probe = sis96x_probe,
+ .remove = __devexit_p(sis96x_remove),
+};
+
+static int __init i2c_sis96x_init(void)
+{
+ printk(KERN_INFO "i2c-sis96x version %s\n", SIS96x_VERSION);
+ return pci_module_init(&sis96x_driver);
+}
+
+static void __exit i2c_sis96x_exit(void)
+{
+ pci_unregister_driver(&sis96x_driver);
+}
+
+MODULE_AUTHOR("Mark M. Hoffman <mhoffman@lightlink.com>");
+MODULE_DESCRIPTION("SiS96x SMBus driver");
+MODULE_LICENSE("GPL");
+
+/* Register initialization functions using helper macros */
+module_init(i2c_sis96x_init);
+module_exit(i2c_sis96x_exit);
+
diff -Nru a/drivers/pci/quirks.c b/drivers/pci/quirks.c
--- a/drivers/pci/quirks.c Mon May 19 15:59:03 2003
+++ b/drivers/pci/quirks.c Mon May 19 15:59:03 2003
@@ -647,6 +647,37 @@
}
/*
+ * SiS 96x south bridge: BIOS typically hides SMBus device...
+ */
+static void __init quirk_sis_96x_smbus(struct pci_dev *dev)
+{
+ u8 val = 0;
+ printk(KERN_INFO "Enabling SiS 96x SMBus.\n");
+ pci_read_config_byte(dev, 0x77, &val);
+ pci_write_config_byte(dev, 0x77, val & ~0x10);
+ pci_read_config_byte(dev, 0x77, &val);
+}
+
+/*
+ * ... This is further complicated by the fact that some SiS96x south
+ * bridges pretend to be 85C503/5513 instead. In that case see if we
+ * spotted a compatible north bridge to make sure.
+ * (pci_find_device doesn't work yet)
+ */
+static int __devinitdata sis_96x_compatible = 0;
+
+static void __init quirk_sis_503_smbus(struct pci_dev *dev)
+{
+ if (sis_96x_compatible)
+ quirk_sis_96x_smbus(dev);
+}
+
+static void __init quirk_sis_96x_compatible(struct pci_dev *dev)
+{
+ sis_96x_compatible = 1;
+}
+
+/*
* The main table of quirks.
*/
@@ -679,6 +710,15 @@
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2, quirk_natoma },
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5597, quirk_nopcipci },
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_496, quirk_nopcipci },
+ { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503, quirk_sis_503_smbus },
+ { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_645, quirk_sis_96x_compatible },
+ { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_646, quirk_sis_96x_compatible },
+ { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_648, quirk_sis_96x_compatible },
+ { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_650, quirk_sis_96x_compatible },
+ { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_651, quirk_sis_96x_compatible },
+ { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_961, quirk_sis_96x_smbus },
+ { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_962, quirk_sis_96x_smbus },
+ { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_963, quirk_sis_96x_smbus },
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1647, quirk_alimagik },
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1651, quirk_alimagik },
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8363_0, quirk_vialatency },
diff -Nru a/include/linux/i2c-id.h b/include/linux/i2c-id.h
--- a/include/linux/i2c-id.h Mon May 19 15:59:03 2003
+++ b/include/linux/i2c-id.h Mon May 19 15:59:03 2003
@@ -245,7 +245,7 @@
#define I2C_HW_SMBUS_SIS5595 0x06
#define I2C_HW_SMBUS_ALI1535 0x07
#define I2C_HW_SMBUS_SIS630 0x08
-#define I2C_HW_SMBUS_SIS645 0x09
+#define I2C_HW_SMBUS_SIS96X 0x09
#define I2C_HW_SMBUS_AMD8111 0x0a
#define I2C_HW_SMBUS_SCX200 0x0b
#define I2C_HW_SMBUS_NFORCE2 0x0c
diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h
--- a/include/linux/pci_ids.h Mon May 19 15:59:03 2003
+++ b/include/linux/pci_ids.h Mon May 19 15:59:03 2003
@@ -569,6 +569,9 @@
#define PCI_DEVICE_ID_SI_751 0x0751
#define PCI_DEVICE_ID_SI_752 0x0752
#define PCI_DEVICE_ID_SI_900 0x0900
+#define PCI_DEVICE_ID_SI_961 0x0961
+#define PCI_DEVICE_ID_SI_962 0x0962
+#define PCI_DEVICE_ID_SI_963 0x0963
#define PCI_DEVICE_ID_SI_5107 0x5107
#define PCI_DEVICE_ID_SI_5300 0x5300
#define PCI_DEVICE_ID_SI_5511 0x5511
^ permalink raw reply [flat|nested] 20+ messages in thread
* Re: [PATCH] Yet more i2c driver changes for 2.5.69
2005-05-19 6:23 ` Greg KH
@ 2005-05-19 6:23 ` Greg KH
-1 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2003-05-19 23:12 UTC (permalink / raw)
To: linux-kernel, sensors
ChangeSet 1.1093.2.4, 2003/05/19 15:32:55-07:00, greg@kroah.com
i2c: fix up i2c-dev driver based on previous core changes.
This fixes the problem that adapter id's are not the minor number for the
i2c-dev devices anymore. Also adds a i2c-dev class to let userspace know
which i2c-dev device is bound to which i2c adapter.
drivers/i2c/i2c-dev.c | 228 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 160 insertions(+), 68 deletions(-)
diff -Nru a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
--- a/drivers/i2c/i2c-dev.c Mon May 19 15:58:41 2003
+++ b/drivers/i2c/i2c-dev.c Mon May 19 15:58:41 2003
@@ -3,6 +3,7 @@
Copyright (C) 1995-97 Simon G. Vogl
Copyright (C) 1998-99 Frodo Looijaard <frodol@dds.nl>
+ Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -28,8 +29,6 @@
/* The devfs code is contributed by Philipp Matthias Hahn
<pmhahn@titan.lahn.de> */
-/* $Id: i2c-dev.c,v 1.53 2003/01/21 08:08:16 kmalkki Exp $ */
-
/* If you want debugging uncomment: */
/* #define DEBUG 1 */
@@ -44,54 +43,84 @@
#include <linux/i2c-dev.h>
#include <asm/uaccess.h>
-/* struct file_operations changed too often in the 2.1 series for nice code */
-
-static ssize_t i2cdev_read (struct file *file, char *buf, size_t count,
- loff_t *offset);
-static ssize_t i2cdev_write (struct file *file, const char *buf, size_t count,
- loff_t *offset);
-
-static int i2cdev_ioctl (struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg);
-static int i2cdev_open (struct inode *inode, struct file *file);
-
-static int i2cdev_release (struct inode *inode, struct file *file);
-
-static int i2cdev_attach_adapter(struct i2c_adapter *adap);
-static int i2cdev_detach_adapter(struct i2c_adapter *adap);
-static int i2cdev_detach_client(struct i2c_client *client);
-static int i2cdev_command(struct i2c_client *client, unsigned int cmd,
- void *arg);
+static struct i2c_client i2cdev_client_template;
-static struct file_operations i2cdev_fops = {
- .owner = THIS_MODULE,
- .llseek = no_llseek,
- .read = i2cdev_read,
- .write = i2cdev_write,
- .ioctl = i2cdev_ioctl,
- .open = i2cdev_open,
- .release = i2cdev_release,
+struct i2c_dev {
+ int minor;
+ struct i2c_adapter *adap;
+ struct class_device class_dev;
};
+#define to_i2c_dev(d) container_of(d, struct i2c_dev, class_dev)
-static struct i2c_driver i2cdev_driver = {
- .owner = THIS_MODULE,
- .name = "dev driver",
- .id = I2C_DRIVERID_I2CDEV,
- .flags = I2C_DF_NOTIFY,
- .attach_adapter = i2cdev_attach_adapter,
- .detach_adapter = i2cdev_detach_adapter,
- .detach_client = i2cdev_detach_client,
- .command = i2cdev_command,
-};
+#define I2C_MINORS 256
+static struct i2c_dev *i2c_dev_array[I2C_MINORS];
+static spinlock_t i2c_dev_array_lock = SPIN_LOCK_UNLOCKED;
-static struct i2c_client i2cdev_client_template = {
- .dev = {
- .name = "I2C /dev entry",
- },
- .id = 1,
- .addr = -1,
- .driver = &i2cdev_driver,
-};
+struct i2c_dev *i2c_dev_get_by_minor(unsigned index)
+{
+ struct i2c_dev *i2c_dev;
+
+ spin_lock(&i2c_dev_array_lock);
+ i2c_dev = i2c_dev_array[index];
+ spin_unlock(&i2c_dev_array_lock);
+ return i2c_dev;
+}
+
+struct i2c_dev *i2c_dev_get_by_adapter(struct i2c_adapter *adap)
+{
+ struct i2c_dev *i2c_dev = NULL;
+ int i;
+
+ spin_lock(&i2c_dev_array_lock);
+ for (i = 0; i < I2C_MINORS; ++i) {
+ if ((i2c_dev_array[i]) &&
+ (i2c_dev_array[i]->adap == adap)) {
+ i2c_dev = i2c_dev_array[i];
+ break;
+ }
+ }
+ spin_unlock(&i2c_dev_array_lock);
+ return i2c_dev;
+}
+
+static struct i2c_dev *get_free_i2c_dev(void)
+{
+ struct i2c_dev *i2c_dev;
+ unsigned int i;
+
+ i2c_dev = kmalloc(sizeof(*i2c_dev), GFP_KERNEL);
+ if (!i2c_dev)
+ return ERR_PTR(-ENOMEM);
+ memset(i2c_dev, 0x00, sizeof(*i2c_dev));
+
+ spin_lock(&i2c_dev_array_lock);
+ for (i = 0; i < I2C_MINORS; ++i) {
+ if (i2c_dev_array[i])
+ continue;
+ i2c_dev->minor = i;
+ i2c_dev_array[i] = i2c_dev;
+ spin_unlock(&i2c_dev_array_lock);
+ return i2c_dev;
+ }
+ spin_unlock(&i2c_dev_array_lock);
+ kfree(i2c_dev);
+ return ERR_PTR(-ENODEV);
+}
+
+static void return_i2c_dev(struct i2c_dev *i2c_dev)
+{
+ spin_lock(&i2c_dev_array_lock);
+ i2c_dev_array[i2c_dev->minor] = NULL;
+ spin_unlock(&i2c_dev_array_lock);
+ kfree(i2c_dev);
+}
+
+static ssize_t show_dev(struct class_device *class_dev, char *buf)
+{
+ struct i2c_dev *i2c_dev = to_i2c_dev(class_dev);
+ return sprintf(buf, "%04x\n", MKDEV(I2C_MAJOR, i2c_dev->minor));
+}
+static CLASS_DEVICE_ATTR(dev, S_IRUGO, show_dev, NULL);
static ssize_t i2cdev_read (struct file *file, char *buf, size_t count,
loff_t *offset)
@@ -104,7 +133,6 @@
if (count > 8192)
count = 8192;
- /* copy user space data to kernel space. */
tmp = kmalloc(count,GFP_KERNEL);
if (tmp==NULL)
return -ENOMEM;
@@ -129,7 +157,6 @@
if (count > 8192)
count = 8192;
- /* copy user space data to kernel space. */
tmp = kmalloc(count,GFP_KERNEL);
if (tmp==NULL)
return -ENOMEM;
@@ -157,7 +184,7 @@
int i,datasize,res;
unsigned long funcs;
- pr_debug("i2c-dev.o: i2c-%d ioctl, cmd: 0x%x, arg: %lx.\n",
+ dev_dbg(&client->dev, "i2c-%d ioctl, cmd: 0x%x, arg: %lx.\n",
minor(inode->i_rdev),cmd, arg);
switch ( cmd ) {
@@ -242,13 +269,11 @@
rdwr_arg.nmsgs);
}
while(i-- > 0) {
- if( res>=0 && (rdwr_pa[i].flags & I2C_M_RD))
- {
+ if( res>=0 && (rdwr_pa[i].flags & I2C_M_RD)) {
if(copy_to_user(
rdwr_arg.msgs[i].buf,
rdwr_pa[i].buf,
- rdwr_pa[i].len))
- {
+ rdwr_pa[i].len)) {
res = -EFAULT;
}
}
@@ -340,9 +365,14 @@
unsigned int minor = minor(inode->i_rdev);
struct i2c_client *client;
struct i2c_adapter *adap;
+ struct i2c_dev *i2c_dev;
- adap = i2c_get_adapter(minor);
- if (NULL == adap)
+ i2c_dev = i2c_dev_get_by_minor(minor);
+ if (!i2c_dev)
+ return -ENODEV;
+
+ adap = i2c_get_adapter(i2c_dev->adap->nr);
+ if (!adap)
return -ENODEV;
client = kmalloc(sizeof(*client), GFP_KERNEL);
@@ -370,29 +400,68 @@
return 0;
}
-int i2cdev_attach_adapter(struct i2c_adapter *adap)
+static struct file_operations i2cdev_fops = {
+ .owner = THIS_MODULE,
+ .llseek = no_llseek,
+ .read = i2cdev_read,
+ .write = i2cdev_write,
+ .ioctl = i2cdev_ioctl,
+ .open = i2cdev_open,
+ .release = i2cdev_release,
+};
+
+static struct class i2c_dev_class = {
+ .name = "i2c-dev",
+};
+
+static int i2cdev_attach_adapter(struct i2c_adapter *adap)
{
- int i;
+ struct i2c_dev *i2c_dev;
+ int retval;
- i = i2c_adapter_id(adap);
- devfs_mk_cdev(MKDEV(I2C_MAJOR, i),
- S_IFCHR|S_IRUSR|S_IWUSR, "i2c/%d", i);
- dev_dbg(&adap->dev, "Registered as minor %d\n", i);
+ i2c_dev = get_free_i2c_dev();
+ if (IS_ERR(i2c_dev))
+ return PTR_ERR(i2c_dev);
+
+ devfs_mk_cdev(MKDEV(I2C_MAJOR, i2c_dev->minor),
+ S_IFCHR|S_IRUSR|S_IWUSR, "i2c/%d", i2c_dev->minor);
+ dev_dbg(&adap->dev, "Registered as minor %d\n", i2c_dev->minor);
+
+ /* register this i2c device with the driver core */
+ i2c_dev->adap = adap;
+ if (adap->dev.parent == &legacy_bus)
+ i2c_dev->class_dev.dev = &adap->dev;
+ else
+ i2c_dev->class_dev.dev = adap->dev.parent;
+ i2c_dev->class_dev.class = &i2c_dev_class;
+ snprintf(i2c_dev->class_dev.class_id, BUS_ID_SIZE, "i2c-%d", i2c_dev->minor);
+ retval = class_device_register(&i2c_dev->class_dev);
+ if (retval)
+ goto error;
+ class_device_create_file(&i2c_dev->class_dev, &class_device_attr_dev);
return 0;
+error:
+ return_i2c_dev(i2c_dev);
+ return retval;
}
-int i2cdev_detach_adapter(struct i2c_adapter *adap)
+static int i2cdev_detach_adapter(struct i2c_adapter *adap)
{
- int i;
+ struct i2c_dev *i2c_dev;
- i = i2c_adapter_id(adap);
+ i2c_dev = i2c_dev_get_by_adapter(adap);
+ if (!i2c_dev)
+ return -ENODEV;
+
+ class_device_unregister(&i2c_dev->class_dev);
+ devfs_remove("i2c/%d", i2c_dev->minor);
+ return_i2c_dev(i2c_dev);
- devfs_remove("i2c/%d", i);
dev_dbg(&adap->dev, "Adapter unregistered\n");
return 0;
}
-int i2cdev_detach_client(struct i2c_client *client)
+static int i2cdev_detach_client(struct i2c_client *client)
{
return 0;
}
@@ -403,7 +472,27 @@
return -1;
}
-int __init i2c_dev_init(void)
+static struct i2c_driver i2cdev_driver = {
+ .owner = THIS_MODULE,
+ .name = "dev driver",
+ .id = I2C_DRIVERID_I2CDEV,
+ .flags = I2C_DF_NOTIFY,
+ .attach_adapter = i2cdev_attach_adapter,
+ .detach_adapter = i2cdev_detach_adapter,
+ .detach_client = i2cdev_detach_client,
+ .command = i2cdev_command,
+};
+
+static struct i2c_client i2cdev_client_template = {
+ .dev = {
+ .name = "I2C /dev entry",
+ },
+ .id = 1,
+ .addr = -1,
+ .driver = &i2cdev_driver,
+};
+
+static int __init i2c_dev_init(void)
{
int res;
@@ -416,6 +505,7 @@
return -EIO;
}
devfs_mk_dir("i2c");
+ class_register(&i2c_dev_class);
if ((res = i2c_add_driver(&i2cdev_driver))) {
printk(KERN_ERR "i2c-dev.o: Driver registration failed, module not inserted.\n");
devfs_remove("i2c");
@@ -428,11 +518,13 @@
static void __exit i2c_dev_exit(void)
{
i2c_del_driver(&i2cdev_driver);
+ class_unregister(&i2c_dev_class);
devfs_remove("i2c");
unregister_chrdev(I2C_MAJOR,"i2c");
}
-MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl> and Simon G. Vogl <simon@tk.uni-linz.ac.at>");
+MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl> and "
+ "Simon G. Vogl <simon@tk.uni-linz.ac.at>");
MODULE_DESCRIPTION("I2C /dev entries driver");
MODULE_LICENSE("GPL");
^ permalink raw reply [flat|nested] 20+ messages in thread
* [BK PATCH] Yet more i2c driver changes for 2.5.65
@ 2005-05-19 6:23 ` Greg KH
0 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel, sensors
Hi,
Here are some more i2c driver changes, they include the stuff I sent out
Friday, but haven't ended up in your tree yet, and 4 patches to fix up
some drivers in the rest of the kernel tree that were broken by my
previous i2c changes.
Please pull from: bk://kernel.bkbits.net/gregkh/linux/i2c-2.5
I'll post just the new patches to the mailing lists.
thanks,
greg k-h
drivers/acorn/char/i2c.c | 4
drivers/i2c/busses/i2c-ali15x3.c | 8 -
drivers/i2c/busses/i2c-amd756.c | 6 -
drivers/i2c/busses/i2c-amd8111.c | 4
drivers/i2c/busses/i2c-i801.c | 8 -
drivers/i2c/busses/i2c-isa.c | 4
drivers/i2c/busses/i2c-piix4.c | 8 -
drivers/i2c/chips/adm1021.c | 21 +--
drivers/i2c/chips/lm75.c | 14 +-
drivers/i2c/i2c-algo-bit.c | 13 +-
drivers/i2c/i2c-algo-pcf.c | 19 +--
drivers/i2c/i2c-core.c | 99 ++++++++--------
drivers/i2c/i2c-dev.c | 21 +--
drivers/i2c/i2c-elektor.c | 10 +
drivers/i2c/i2c-elv.c | 6 -
drivers/i2c/i2c-philips-par.c | 4
drivers/i2c/i2c-proc.c | 180 +++++++-----------------------
drivers/i2c/i2c-velleman.c | 4
drivers/i2c/scx200_acb.c | 32 ++---
drivers/ieee1394/pcilynx.c | 4
drivers/media/video/adv7175.c | 22 ++-
drivers/media/video/bt819.c | 33 +++--
drivers/media/video/bt856.c | 27 ++--
drivers/media/video/bttv-if.c | 22 ++-
drivers/media/video/msp3400.c | 32 ++---
drivers/media/video/saa5249.c | 13 +-
drivers/media/video/saa7110.c | 19 +--
drivers/media/video/saa7111.c | 21 ++-
drivers/media/video/saa7134/saa7134-i2c.c | 10 +
drivers/media/video/saa7185.c | 19 +--
drivers/media/video/tda7432.c | 16 +-
drivers/media/video/tda9875.c | 16 +-
drivers/media/video/tda9887.c | 14 +-
drivers/media/video/tuner-3036.c | 6 -
drivers/media/video/tuner.c | 29 ++--
drivers/media/video/tvaudio.c | 44 +++----
drivers/video/matrox/i2c-matroxfb.c | 11 +
include/linux/i2c.h | 33 +++--
38 files changed, 424 insertions(+), 432 deletions(-)
------
Greg Kroah-Hartman <greg@kroah.com>:
o i2c: fix up drivers/video/matrox/i2c-matroxfb.c due to previous i2c changes
o i2c: fix up drivers/ieee1394/pcilynx.c due to previous i2c changes
o i2c: fix up drivers/acorn/char/i2c.c due to previous i2c changes
o i2c: fix up drivers/media/video/* due to previous i2c changes
o i2c: ugh, clean up lindent mess in i2c-proc.c::i2c_detect()
o i2c: fix up the chip driver names to play nice with sysfs
o i2c: actually register the i2c client device with the driver core
o i2c: Removed the name variable from i2c_client as the dev one should be used instead
o i2c: remove the data field from struct i2c_client
o i2c: add struct device to i2c_client structure
o i2c: remove *data from i2c_adapter, as dev->data should be used instead
o i2c: remove i2c_adapter->name and use dev->name instead
Petr Vandrovec <vandrove@vc.cvut.cz>:
o Fix kobject_get oopses triggered by i2c in 2.5.65-bk
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH] Yet more i2c driver changes for 2.5.65
@ 2005-05-19 6:23 ` Greg KH
0 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw)
To: linux-kernel, sensors
ChangeSet 1.889.354.14, 2003/03/22 23:20:40-08:00, greg@kroah.com
i2c: fix up drivers/media/video/* due to previous i2c changes.
diff -Nru a/drivers/media/video/adv7175.c b/drivers/media/video/adv7175.c
--- a/drivers/media/video/adv7175.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/adv7175.c Sun Mar 23 00:11:01 2003
@@ -170,6 +170,7 @@
client=kmalloc(sizeof(*client), GFP_KERNEL);
if(client = NULL)
return -ENOMEM;
+ memset(client, 0, sizeof(*client));
client_template.adapter = adap;
client_template.addr = addr;
@@ -190,9 +191,10 @@
// We should never get here!!!
dname = unknown_name;
}
- strcpy(client->name, dname);
+ strncpy(client->dev.name, dname, DEVICE_NAME_SIZE);
init_MUTEX(&encoder->lock);
encoder->client = client;
+ i2c_set_clientdata(client, encoder);
encoder->addr = addr;
encoder->norm = VIDEO_MODE_PAL;
encoder->input = 0;
@@ -201,7 +203,7 @@
for (i=1; i<x_common; i++) {
rv = i2c_smbus_write_byte(client,init_common[i]);
if (rv < 0) {
- printk(KERN_ERR "%s_attach: init error %d\n", client->name, rv);
+ printk(KERN_ERR "%s_attach: init error %d\n", client->dev.name, rv);
break;
}
}
@@ -211,7 +213,7 @@
i2c_smbus_write_byte_data(client,0x07, TR0MODE);
i2c_smbus_read_byte_data(client,0x12);
printk(KERN_INFO "%s_attach: %s rev. %d at 0x%02x\n",
- client->name, dname, rv & 1, client->addr);
+ client->dev.name, dname, rv & 1, client->addr);
}
i2c_attach_client(client);
@@ -229,7 +231,7 @@
static int adv717x_detach(struct i2c_client *client)
{
i2c_detach_client(client);
- kfree(client->data);
+ i2c_get_clientdata(client);
kfree(client);
return 0;
}
@@ -237,7 +239,7 @@
static int adv717x_command(struct i2c_client *client, unsigned int cmd,
void *arg)
{
- struct adv7175 *encoder = client->data;
+ struct adv7175 *encoder = i2c_get_clientdata(client);
int i, x_ntsc\x13, x_pal\x13;
/* x_ntsc is number of entries in init_ntsc -1 */
/* x_pal is number of entries in init_pal -1 */
@@ -297,7 +299,7 @@
default:
printk(KERN_ERR
"%s: illegal norm: %d\n",
- client->name, iarg);
+ client->dev.name, iarg);
return -EINVAL;
}
@@ -353,7 +355,7 @@
default:
printk(KERN_ERR
"%s: illegal input: %d\n",
- client->name, iarg);
+ client->dev.name, iarg);
return -EINVAL;
}
@@ -419,8 +421,10 @@
};
static struct i2c_client client_template = {
- .name = "adv7175_client",
- .driver = &i2c_driver_adv7175
+ .driver = &i2c_driver_adv7175,
+ .dev = {
+ .name = "adv7175_client",
+ },
};
static int adv717x_init(void)
diff -Nru a/drivers/media/video/bt819.c b/drivers/media/video/bt819.c
--- a/drivers/media/video/bt819.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/bt819.c Sun Mar 23 00:11:01 2003
@@ -128,7 +128,7 @@
struct timing *timing;
- decoder = client->data;
+ decoder = i2c_get_clientdata(client);
timing = &timing_data[decoder->norm];
init[3 * 2 - 1] = (((timing->vdelay >> 8) & 0x03) << 6) |
@@ -159,6 +159,7 @@
client = kmalloc(sizeof(*client), GFP_KERNEL);
if(client = NULL)
return -ENOMEM;
+ memset(client, 0, sizeof(*client));
client_template.adapter = adap;
client_template.addr = addr;
memcpy(client, &client_template, sizeof(*client));
@@ -170,8 +171,8 @@
}
memset(decoder, 0, sizeof(struct bt819));
- strcpy(client->name, "bt819");
- client->data = decoder;
+ strncpy(client->dev.name, "bt819", DEVICE_NAME_SIZE);
+ i2c_set_clientdata(client, decoder);
decoder->client = client;
decoder->addr = addr;
decoder->norm = VIDEO_MODE_NTSC;
@@ -186,10 +187,10 @@
i = bt819_init(client);
if (i < 0) {
printk(KERN_ERR "%s: bt819_attach: init status %d\n",
- decoder->client->name, i);
+ decoder->client->dev.name, i);
} else {
printk(KERN_INFO "%s: bt819_attach: chip version %x\n",
- decoder->client->name, i2c_smbus_read_byte_data(client,
+ decoder->client->dev.name, i2c_smbus_read_byte_data(client,
0x17) & 0x0f);
}
init_MUTEX(&decoder->lock);
@@ -205,7 +206,7 @@
static int bt819_detach(struct i2c_client *client)
{
i2c_detach_client(client);
- kfree(client->data);
+ i2c_get_clientdata(client);
kfree(client);
MOD_DEC_USE_COUNT;
return 0;
@@ -215,7 +216,7 @@
{
int temp;
- struct bt819 *decoder = client->data;
+ struct bt819 *decoder = i2c_get_clientdata(client);
//return 0;
if (!decoder->initialized) { // First call to bt819_init could be
@@ -268,7 +269,7 @@
*iarg = res;
DEBUG(printk(KERN_INFO "%s-bt819: get status %x\n",
- decoder->client->name, *iarg));
+ decoder->client->dev.name, *iarg));
}
break;
@@ -278,7 +279,7 @@
struct timing *timing;
DEBUG(printk(KERN_INFO "%s-bt819: set norm %x\n",
- decoder->client->name, *iarg));
+ decoder->client->dev.name, *iarg));
if (*iarg = VIDEO_MODE_NTSC) {
bt819_setbit(decoder, 0x01, 0, 1);
@@ -319,7 +320,7 @@
int *iarg = arg;
DEBUG(printk(KERN_INFO "%s-bt819: set input %x\n",
- decoder->client->name, *iarg));
+ decoder->client->dev.name, *iarg));
if (*iarg < 0 || *iarg > 7) {
return -EINVAL;
@@ -344,7 +345,7 @@
int *iarg = arg;
DEBUG(printk(KERN_INFO "%s-bt819: set output %x\n",
- decoder->client->name, *iarg));
+ decoder->client->dev.name, *iarg));
/* not much choice of outputs */
if (*iarg != 0) {
@@ -360,7 +361,7 @@
DEBUG(printk
(KERN_INFO "%s-bt819: enable output %x\n",
- decoder->client->name, *iarg));
+ decoder->client->dev.name, *iarg));
if (decoder->enable != enable) {
decoder->enable = enable;
@@ -381,7 +382,7 @@
DEBUG(printk
(KERN_INFO
"%s-bt819: set picture brightness %d contrast %d colour %d\n",
- decoder->client->name, pic->brightness,
+ decoder->client->dev.name, pic->brightness,
pic->contrast, pic->colour));
@@ -448,9 +449,11 @@
};
static struct i2c_client client_template = {
- .name = "bt819_client",
.id = -1,
- .driver = &i2c_driver_bt819
+ .driver = &i2c_driver_bt819,
+ .dev = {
+ .name = "bt819_client",
+ },
};
static int bt819_setup(void)
diff -Nru a/drivers/media/video/bt856.c b/drivers/media/video/bt856.c
--- a/drivers/media/video/bt856.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/bt856.c Sun Mar 23 00:11:01 2003
@@ -106,6 +106,7 @@
client = kmalloc(sizeof(*client), GFP_KERNEL);
if(client = NULL)
return -ENOMEM;
+ memset(client, 0, sizeof(*client));
client_template.adapter = adap;
client_template.addr = addr;
memcpy(client, &client_template, sizeof(*client));
@@ -123,14 +124,14 @@
memset(encoder, 0, sizeof(struct bt856));
- strcpy(client->name, "bt856");
+ strncpy(client->dev.name, "bt856", DEVICE_NAME_SIZE);
encoder->client = client;
- client->data = encoder;
+ i2c_set_clientdata(client, encoder);
encoder->addr = client->addr;
encoder->norm = VIDEO_MODE_NTSC;
encoder->enable = 1;
- DEBUG(printk(KERN_INFO "%s-bt856: attach\n", encoder->client->name));
+ DEBUG(printk(KERN_INFO "%s-bt856: attach\n", encoder->client->dev.name));
i2c_smbus_write_byte_data(client, 0xdc, 0x18);
encoder->reg[0xdc] = 0x18;
@@ -171,7 +172,7 @@
static int bt856_detach(struct i2c_client *client)
{
i2c_detach_client(client);
- kfree(client->data);
+ i2c_get_clientdata(client);
kfree(client);
MOD_DEC_USE_COUNT;
return 0;
@@ -180,7 +181,7 @@
static int bt856_command(struct i2c_client *client, unsigned int cmd,
void *arg)
{
- struct bt856 *encoder = client->data;
+ struct bt856 *encoder = i2c_get_clientdata(client);
switch (cmd) {
@@ -190,7 +191,7 @@
DEBUG(printk
(KERN_INFO "%s-bt856: get capabilities\n",
- encoder->client->name));
+ encoder->client->dev.name));
cap->flags
= VIDEO_ENCODER_PAL
@@ -205,7 +206,7 @@
int *iarg = arg;
DEBUG(printk(KERN_INFO "%s-bt856: set norm %d\n",
- encoder->client->name, *iarg));
+ encoder->client->dev.name, *iarg));
switch (*iarg) {
@@ -232,7 +233,7 @@
int *iarg = arg;
DEBUG(printk(KERN_INFO "%s-bt856: set input %d\n",
- encoder->client->name, *iarg));
+ encoder->client->dev.name, *iarg));
/* We only have video bus.
*iarg = 0: input is from bt819
@@ -268,7 +269,7 @@
int *iarg = arg;
DEBUG(printk(KERN_INFO "%s-bt856: set output %d\n",
- encoder->client->name, *iarg));
+ encoder->client->dev.name, *iarg));
/* not much choice of outputs */
if (*iarg != 0) {
@@ -285,7 +286,7 @@
DEBUG(printk
(KERN_INFO "%s-bt856: enable output %d\n",
- encoder->client->name, encoder->enable));
+ encoder->client->dev.name, encoder->enable));
}
break;
@@ -309,9 +310,11 @@
};
static struct i2c_client client_template = {
- .name = "bt856_client",
.id = -1,
- .driver = &i2c_driver_bt856
+ .driver = &i2c_driver_bt856,
+ .dev = {
+ .name = "bt856_client",
+ },
};
static int bt856_init(void)
diff -Nru a/drivers/media/video/bttv-if.c b/drivers/media/video/bttv-if.c
--- a/drivers/media/video/bttv-if.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/bttv-if.c Sun Mar 23 00:11:01 2003
@@ -194,7 +194,7 @@
static int attach_inform(struct i2c_client *client)
{
- struct bttv *btv = (struct bttv*)client->adapter->data;
+ struct bttv *btv = i2c_get_adapdata(client->adapter);
int i;
for (i = 0; i < I2C_CLIENTS_MAX; i++) {
@@ -207,13 +207,13 @@
bttv_call_i2c_clients(btv,TUNER_SET_TYPE,&btv->tuner_type);
if (bttv_verbose)
printk("bttv%d: i2c attach [client=%s,%s]\n",btv->nr,
- client->name, (i < I2C_CLIENTS_MAX) ? "ok" : "failed");
+ client->dev.name, (i < I2C_CLIENTS_MAX) ? "ok" : "failed");
return 0;
}
static int detach_inform(struct i2c_client *client)
{
- struct bttv *btv = (struct bttv*)client->adapter->data;
+ struct bttv *btv = i2c_get_adapdata(client->adapter);
int i;
for (i = 0; i < I2C_CLIENTS_MAX; i++) {
@@ -224,7 +224,7 @@
}
if (bttv_verbose)
printk("bttv%d: i2c detach [client=%s,%s]\n",btv->nr,
- client->name, (i < I2C_CLIENTS_MAX) ? "ok" : "failed");
+ client->dev.name, (i < I2C_CLIENTS_MAX) ? "ok" : "failed");
return 0;
}
@@ -261,15 +261,19 @@
static struct i2c_adapter bttv_i2c_adap_template = {
.owner = THIS_MODULE,
- .name = "bt848",
.id = I2C_HW_B_BT848,
.client_register = attach_inform,
.client_unregister = detach_inform,
+ .dev = {
+ .name = "bt848",
+ },
};
static struct i2c_client bttv_i2c_client_template = {
- .name = "bttv internal use only",
- .id = -1,
+ .id = -1,
+ .dev = {
+ .name = "bttv internal",
+ },
};
@@ -343,10 +347,10 @@
memcpy(&btv->i2c_client, &bttv_i2c_client_template,
sizeof(struct i2c_client));
- sprintf(btv->i2c_adap.name+strlen(btv->i2c_adap.name),
+ sprintf(btv->i2c_adap.dev.name+strlen(btv->i2c_adap.dev.name),
" #%d", btv->nr);
btv->i2c_algo.data = btv;
- btv->i2c_adap.data = btv;
+ i2c_set_adapdata(&btv->i2c_adap, btv);
btv->i2c_adap.algo_data = &btv->i2c_algo;
btv->i2c_client.adapter = &btv->i2c_adap;
diff -Nru a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
--- a/drivers/media/video/msp3400.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/msp3400.c Sun Mar 23 00:11:01 2003
@@ -349,7 +349,7 @@
static void
msp3400c_set_scart(struct i2c_client *client, int in, int out)
{
- struct msp3400c *msp = client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
if (-1 = scarts[out][in])
return;
@@ -411,7 +411,7 @@
static void msp3400c_setmode(struct i2c_client *client, int type)
{
- struct msp3400c *msp = client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
int i;
dprintk("msp3400: setmode: %d\n",type);
@@ -471,7 +471,7 @@
{
static char *strmode[] = { "0", "mono", "stereo", "3",
"lang1", "5", "6", "7", "lang2" };
- struct msp3400c *msp = client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
int nicam=0; /* channel source: FM/AM or nicam */
int src=0;
@@ -599,7 +599,7 @@
static void
msp3400c_restore_dfp(struct i2c_client *client)
{
- struct msp3400c *msp = client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
int i;
for (i = 0; i < DFP_COUNT; i++) {
@@ -627,7 +627,7 @@
static int
autodetect_stereo(struct i2c_client *client)
{
- struct msp3400c *msp = client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
int val;
int newstereo = msp->stereo;
int newnicam = msp->nicam_on;
@@ -727,7 +727,7 @@
/* stereo/multilang monitoring */
static void watch_stereo(struct i2c_client *client)
{
- struct msp3400c *msp = client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
if (autodetect_stereo(client)) {
if (msp->stereo & VIDEO_SOUND_STEREO)
@@ -746,7 +746,7 @@
static int msp3400c_thread(void *data)
{
struct i2c_client *client = data;
- struct msp3400c *msp = client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
struct CARRIER_DETECT *cd;
int count, max1,max2,val1,val2, val,this;
@@ -1002,7 +1002,7 @@
static int msp3410d_thread(void *data)
{
struct i2c_client *client = data;
- struct msp3400c *msp = client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
int mode,val,i,std;
#ifdef CONFIG_SMP
@@ -1226,9 +1226,11 @@
static struct i2c_client client_template =
{
- .name = "(unset)",
.flags = I2C_CLIENT_ALLOW_USE,
.driver = &driver,
+ .dev = {
+ .name = "(unset)",
+ },
};
static int msp_attach(struct i2c_adapter *adap, int addr,
@@ -1265,7 +1267,7 @@
for (i = 0; i < DFP_COUNT; i++)
msp->dfp_regs[i] = -1;
- c->data = msp;
+ i2c_set_clientdata(c, msp);
init_waitqueue_head(&msp->wq);
if (-1 = msp3400c_reset(c)) {
@@ -1291,7 +1293,7 @@
#endif
msp3400c_setvolume(c,msp->muted,msp->left,msp->right);
- sprintf(c->name,"MSP34%02d%c-%c%d",
+ snprintf(c->dev.name, DEVICE_NAME_SIZE, "MSP34%02d%c-%c%d",
(rev2>>8)&0xff, (rev1&0xff)+'@', ((rev1>>8)&0xff)+'@', rev2&0x1f);
msp->nicam = (((rev2>>8)&0xff) != 00) ? 1 : 0;
@@ -1310,7 +1312,7 @@
msp->wake_stereo.data = (unsigned long)msp;
/* hello world :-) */
- printk(KERN_INFO "msp34xx: init: chip=%s",c->name);
+ printk(KERN_INFO "msp34xx: init: chip=%s",c->dev.name);
if (msp->nicam)
printk(", has NICAM support");
printk("\n");
@@ -1340,7 +1342,7 @@
static int msp_detach(struct i2c_client *client)
{
DECLARE_MUTEX_LOCKED(sem);
- struct msp3400c *msp = (struct msp3400c*)client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
int i;
/* shutdown control thread */
@@ -1379,7 +1381,7 @@
static void msp_wake_thread(struct i2c_client *client)
{
- struct msp3400c *msp = (struct msp3400c*)client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
msp3400c_setvolume(client,msp->muted,0,0);
msp->watch_stereo=0;
@@ -1391,7 +1393,7 @@
static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
{
- struct msp3400c *msp = (struct msp3400c*)client->data;
+ struct msp3400c *msp = i2c_get_clientdata(client);
__u16 *sarg = arg;
#if 0
int *iarg = (int*)arg;
diff -Nru a/drivers/media/video/saa5249.c b/drivers/media/video/saa5249.c
--- a/drivers/media/video/saa5249.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/saa5249.c Sun Mar 23 00:11:01 2003
@@ -171,20 +171,21 @@
return -ENOMEM;
}
memset(t, 0, sizeof(*t));
- strcpy(client->name, IF_NAME);
+ strncpy(client->dev.name, IF_NAME, DEVICE_NAME_SIZE);
init_MUTEX(&t->lock);
/*
* Now create a video4linux device
*/
- client->data = vd=(struct video_device *)kmalloc(sizeof(struct video_device), GFP_KERNEL);
+ vd = (struct video_device *)kmalloc(sizeof(struct video_device), GFP_KERNEL);
if(vd=NULL)
{
kfree(t);
kfree(client);
return -ENOMEM;
}
+ i2c_set_clientdata(client, vd);
memcpy(vd, &saa_template, sizeof(*vd));
for (pgbuf = 0; pgbuf < NUM_DAUS; pgbuf++)
@@ -234,7 +235,7 @@
static int saa5249_detach(struct i2c_client *client)
{
- struct video_device *vd=client->data;
+ struct video_device *vd = i2c_get_clientdata(client);
i2c_detach_client(client);
video_unregister_device(vd);
kfree(vd->priv);
@@ -264,9 +265,11 @@
};
static struct i2c_client client_template = {
- .name = "(unset)",
.id = -1,
- .driver = &i2c_driver_videotext
+ .driver = &i2c_driver_videotext,
+ .dev = {
+ .name = "(unset)",
+ },
};
/*
diff -Nru a/drivers/media/video/saa7110.c b/drivers/media/video/saa7110.c
--- a/drivers/media/video/saa7110.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/saa7110.c Sun Mar 23 00:11:01 2003
@@ -163,6 +163,7 @@
client=kmalloc(sizeof(*client), GFP_KERNEL);
if(client = NULL)
return -ENOMEM;
+ memset(client, 0, sizeof(*client));
client_template.adapter = adap;
client_template.addr = addr;
memcpy(client, &client_template, sizeof(*client));
@@ -175,9 +176,9 @@
/* clear our private data */
memset(decoder, 0, sizeof(*decoder));
- strcpy(client->name, IF_NAME);
+ strncpy(client->dev.name, IF_NAME, DEVICE_NAME_SIZE);
decoder->client = client;
- client->data = decoder;
+ i2c_set_clientdata(client, decoder);
decoder->addr = addr;
decoder->norm = VIDEO_MODE_PAL;
decoder->input = 0;
@@ -189,7 +190,7 @@
rv = i2c_master_send(client, initseq, sizeof(initseq));
if (rv < 0)
- printk(KERN_ERR "%s_attach: init status %d\n", client->name, rv);
+ printk(KERN_ERR "%s_attach: init status %d\n", client->dev.name, rv);
else {
i2c_smbus_write_byte_data(client,0x21,0x16);
i2c_smbus_write_byte_data(client,0x0D,0x04);
@@ -213,7 +214,7 @@
static
int saa7110_detach(struct i2c_client *client)
{
- struct saa7110* decoder = client->data;
+ struct saa7110* decoder = i2c_get_clientdata(client);
i2c_detach_client(client);
@@ -232,7 +233,7 @@
static
int saa7110_command(struct i2c_client *client, unsigned int cmd, void *arg)
{
- struct saa7110* decoder = client->data;
+ struct saa7110* decoder = i2c_get_clientdata(client);
int v;
switch (cmd) {
@@ -251,7 +252,7 @@
case DECODER_GET_STATUS:
{
- struct saa7110* decoder = client->data;
+ struct saa7110* decoder = i2c_get_clientdata(client);
int status;
int res = 0;
@@ -390,9 +391,11 @@
.command = saa7110_command
};
static struct i2c_client client_template = {
- .name = "saa7110_client",
.id = -1,
- .driver = &i2c_driver_saa7110
+ .driver = &i2c_driver_saa7110,
+ .dev = {
+ .name = "saa7110_client",
+ },
};
static int saa7110_init(void)
diff -Nru a/drivers/media/video/saa7111.c b/drivers/media/video/saa7111.c
--- a/drivers/media/video/saa7111.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/saa7111.c Sun Mar 23 00:11:01 2003
@@ -120,6 +120,7 @@
client = kmalloc(sizeof(*client), GFP_KERNEL);
if(client = NULL)
return -ENOMEM;
+ memset(client, 0, sizeof(*client));
client_template.adapter = adap;
client_template.addr = addr;
memcpy(client, &client_template, sizeof(*client));
@@ -132,9 +133,9 @@
}
memset(decoder, 0, sizeof(*decoder));
- strcpy(client->name, "saa7111");
+ strncpy(client->dev.name, "saa7111", DEVICE_NAME_SIZE);
decoder->client = client;
- client->data = decoder;
+ i2c_set_clientdata(client, decoder);
decoder->addr = addr;
decoder->norm = VIDEO_MODE_NTSC;
decoder->input = 0;
@@ -147,10 +148,10 @@
i = i2c_master_send(client, init, sizeof(init));
if (i < 0) {
printk(KERN_ERR "%s_attach: init status %d\n",
- client->name, i);
+ client->dev.name, i);
} else {
printk(KERN_INFO "%s_attach: chip version %x\n",
- client->name, i2c_smbus_read_byte_data(client, 0x00) >> 4);
+ client->dev.name, i2c_smbus_read_byte_data(client, 0x00) >> 4);
}
init_MUTEX(&decoder->lock);
i2c_attach_client(client);
@@ -164,7 +165,7 @@
static int saa7111_detach(struct i2c_client *client)
{
- struct saa7111 *decoder = client->data;
+ struct saa7111 *decoder = i2c_get_clientdata(client);
i2c_detach_client(client);
kfree(decoder);
kfree(client);
@@ -175,7 +176,7 @@
static int saa7111_command(struct i2c_client *client, unsigned int cmd,
void *arg)
{
- struct saa7111 *decoder = client->data;
+ struct saa7111 *decoder = i2c_get_clientdata(client);
switch (cmd) {
@@ -187,7 +188,7 @@
for (i = 0; i < 32; i += 16) {
int j;
- printk("KERN_DEBUG %s: %03x", client->name,
+ printk("KERN_DEBUG %s: %03x", client->dev.name,
i);
for (j = 0; j < 16; ++j) {
printk(" %02x",
@@ -407,9 +408,11 @@
};
static struct i2c_client client_template = {
- .name = "saa7111_client",
.id = -1,
- .driver = &i2c_driver_saa7111
+ .driver = &i2c_driver_saa7111,
+ .dev = {
+ .name = "saa7111_client",
+ },
};
static int saa7111_init(void)
diff -Nru a/drivers/media/video/saa7134/saa7134-i2c.c b/drivers/media/video/saa7134/saa7134-i2c.c
--- a/drivers/media/video/saa7134/saa7134-i2c.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/saa7134/saa7134-i2c.c Sun Mar 23 00:11:01 2003
@@ -334,15 +334,19 @@
static struct i2c_adapter saa7134_adap_template = {
.owner = THIS_MODULE,
- .name = "saa7134",
.id = I2C_ALGO_SAA7134,
.algo = &saa7134_algo,
.client_register = attach_inform,
+ .dev = {
+ .name = "saa7134",
+ },
};
static struct i2c_client saa7134_client_template = {
- .name = "saa7134 internal",
.id = -1,
+ .dev = {
+ .name = "saa7134 internal",
+ },
};
/* ----------------------------------------------------------- */
@@ -410,7 +414,7 @@
int saa7134_i2c_register(struct saa7134_dev *dev)
{
dev->i2c_adap = saa7134_adap_template;
- strcpy(dev->i2c_adap.name,dev->name);
+ strncpy(dev->i2c_adap.dev.name, dev->name, DEVICE_NAME_SIZE);
dev->i2c_adap.algo_data = dev;
i2c_add_adapter(&dev->i2c_adap);
diff -Nru a/drivers/media/video/saa7185.c b/drivers/media/video/saa7185.c
--- a/drivers/media/video/saa7185.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/saa7185.c Sun Mar 23 00:11:01 2003
@@ -191,6 +191,7 @@
client = kmalloc(sizeof(*client), GFP_KERNEL);
if (client = NULL)
return -ENOMEM;
+ memset(client, 0, sizeof(*client));
client_template.adapter = adap;
client_template.addr = addr;
memcpy(client, &client_template, sizeof(*client));
@@ -202,9 +203,9 @@
memset(encoder, 0, sizeof(*encoder));
- strcpy(client->name, "saa7185");
+ strncpy(client->dev.name, "saa7185", DEVICE_NAME_SIZE);
encoder->client = client;
- client->data = encoder;
+ i2c_set_clientdata(client, encoder);
encoder->addr = addr;
encoder->norm = VIDEO_MODE_NTSC;
encoder->enable = 1;
@@ -215,11 +216,11 @@
sizeof(init_ntsc));
}
if (i < 0) {
- printk(KERN_ERR "%s_attach: init error %d\n", client->name,
+ printk(KERN_ERR "%s_attach: init error %d\n", client->dev.name,
i);
} else {
printk(KERN_INFO "%s_attach: chip version %d\n",
- client->name, i2c_smbus_read_byte(client) >> 5);
+ client->dev.name, i2c_smbus_read_byte(client) >> 5);
}
init_MUTEX(&encoder->lock);
i2c_attach_client(client);
@@ -233,7 +234,7 @@
static int saa7185_detach(struct i2c_client *client)
{
- struct saa7185 *encoder = client->data;
+ struct saa7185 *encoder = i2c_get_clientdata(client);
i2c_detach_client(client);
i2c_smbus_write_byte_data(client, 0x61, (encoder->reg[0x61]) | 0x40); /* SW: output off is active */
//i2c_smbus_write_byte_data(client, 0x3a, (encoder->reg[0x3a]) | 0x80); /* SW: color bar */
@@ -246,7 +247,7 @@
static int saa7185_command(struct i2c_client *client, unsigned int cmd,
void *arg)
{
- struct saa7185 *encoder = client->data;
+ struct saa7185 *encoder = i2c_get_clientdata(client);
switch (cmd) {
@@ -365,9 +366,11 @@
};
static struct i2c_client client_template = {
- .name = "saa7185_client",
.id = -1,
- .driver = &i2c_driver_saa7185
+ .driver = &i2c_driver_saa7185,
+ .dev = {
+ .name = "saa7185_client",
+ },
};
static int saa7185_init(void)
diff -Nru a/drivers/media/video/tda7432.c b/drivers/media/video/tda7432.c
--- a/drivers/media/video/tda7432.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/tda7432.c Sun Mar 23 00:11:01 2003
@@ -260,7 +260,7 @@
static int tda7432_set(struct i2c_client *client)
{
- struct tda7432 *t = client->data;
+ struct tda7432 *t = i2c_get_clientdata(client);
unsigned char buf[16];
d2printk("tda7432: In tda7432_set\n");
@@ -287,7 +287,7 @@
static void do_tda7432_init(struct i2c_client *client)
{
- struct tda7432 *t = client->data;
+ struct tda7432 *t = i2c_get_clientdata(client);
d2printk("tda7432: In tda7432_init\n");
t->input = TDA7432_STEREO_IN | /* Main (stereo) input */
@@ -328,11 +328,11 @@
memcpy(client,&client_template,sizeof(struct i2c_client));
client->adapter = adap;
client->addr = addr;
- client->data = t;
+ i2c_set_clientdata(client, t);
do_tda7432_init(client);
MOD_INC_USE_COUNT;
- strcpy(client->name,"TDA7432");
+ strncpy(client->dev.name, "TDA7432", DEVICE_NAME_SIZE);
printk(KERN_INFO "tda7432: init\n");
i2c_attach_client(client);
@@ -348,7 +348,7 @@
static int tda7432_detach(struct i2c_client *client)
{
- struct tda7432 *t = client->data;
+ struct tda7432 *t = i2c_get_clientdata(client);
do_tda7432_init(client);
i2c_detach_client(client);
@@ -361,7 +361,7 @@
static int tda7432_command(struct i2c_client *client,
unsigned int cmd, void *arg)
{
- struct tda7432 *t = client->data;
+ struct tda7432 *t = i2c_get_clientdata(client);
d2printk("tda7432: In tda7432_command\n");
switch (cmd) {
@@ -526,9 +526,11 @@
static struct i2c_client client_template {
- .name = "tda7432",
.id = -1,
.driver = &driver,
+ .dev = {
+ .name = "tda7432",
+ },
};
static int tda7432_init(void)
diff -Nru a/drivers/media/video/tda9875.c b/drivers/media/video/tda9875.c
--- a/drivers/media/video/tda9875.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/tda9875.c Sun Mar 23 00:11:01 2003
@@ -158,7 +158,7 @@
static void tda9875_set(struct i2c_client *client)
{
- struct tda9875 *tda = client->data;
+ struct tda9875 *tda = i2c_get_clientdata(client);
unsigned char a;
dprintk(KERN_DEBUG "tda9875_set(%04x,%04x,%04x,%04x)\n",tda->lvol,tda->rvol,tda->bass,tda->treble);
@@ -176,7 +176,7 @@
static void do_tda9875_init(struct i2c_client *client)
{
- struct tda9875 *t = client->data;
+ struct tda9875 *t = i2c_get_clientdata(client);
dprintk("In tda9875_init\n");
tda9875_write(client, TDA9875_CFG, 0xd0 ); /*reg de config 0 (reset)*/
tda9875_write(client, TDA9875_MSR, 0x03 ); /* Monitor 0b00000XXX*/
@@ -256,7 +256,7 @@
memcpy(client,&client_template,sizeof(struct i2c_client));
client->adapter = adap;
client->addr = addr;
- client->data = t;
+ i2c_set_clientdata(client, t);
if(!tda9875_checkit(adap,addr)) {
kfree(t);
@@ -265,7 +265,7 @@
do_tda9875_init(client);
MOD_INC_USE_COUNT;
- strcpy(client->name,"TDA9875");
+ strncpy(client->dev.name, "TDA9875", DEVICE_NAME_SIZE);
printk(KERN_INFO "tda9875: init\n");
i2c_attach_client(client);
@@ -281,7 +281,7 @@
static int tda9875_detach(struct i2c_client *client)
{
- struct tda9875 *t = client->data;
+ struct tda9875 *t = i2c_get_clientdata(client);
do_tda9875_init(client);
i2c_detach_client(client);
@@ -294,7 +294,7 @@
static int tda9875_command(struct i2c_client *client,
unsigned int cmd, void *arg)
{
- struct tda9875 *t = client->data;
+ struct tda9875 *t = i2c_get_clientdata(client);
dprintk("In tda9875_command...\n");
@@ -396,9 +396,11 @@
static struct i2c_client client_template {
- .name = "tda9875",
.id = -1,
.driver = &driver,
+ .dev = {
+ .name = "tda9875",
+ },
};
static int tda9875_init(void)
diff -Nru a/drivers/media/video/tda9887.c b/drivers/media/video/tda9887.c
--- a/drivers/media/video/tda9887.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/tda9887.c Sun Mar 23 00:11:01 2003
@@ -359,7 +359,7 @@
return -ENOMEM;
memset(t,0,sizeof(*t));
t->client = client_template;
- t->client.data = t;
+ i2c_set_clientdata(&t->client, t);
t->pinnacle_id = -1;
i2c_attach_client(&t->client);
@@ -376,12 +376,12 @@
case I2C_ALGO_BIT | I2C_HW_B_RIVA:
case I2C_ALGO_SAA7134:
printk("tda9887: probing %s i2c adapter [id=0x%x]\n",
- adap->name,adap->id);
+ adap->dev.name,adap->id);
rc = i2c_probe(adap, &addr_data, tda9887_attach);
break;
default:
printk("tda9887: ignoring %s i2c adapter [id=0x%x]\n",
- adap->name,adap->id);
+ adap->dev.name,adap->id);
rc = 0;
/* nothing */
}
@@ -390,7 +390,7 @@
static int tda9887_detach(struct i2c_client *client)
{
- struct tda9887 *t = (struct tda9887*)client->data;
+ struct tda9887 *t = i2c_get_clientdata(client);
i2c_detach_client(client);
kfree(t);
@@ -401,7 +401,7 @@
static int
tda9887_command(struct i2c_client *client, unsigned int cmd, void *arg)
{
- struct tda9887 *t = (struct tda9887*)client->data;
+ struct tda9887 *t = i2c_get_clientdata(client);
switch (cmd) {
@@ -456,9 +456,11 @@
};
static struct i2c_client client_template {
- .name = "tda9887",
.flags = I2C_CLIENT_ALLOW_USE,
.driver = &driver,
+ .dev = {
+ .name = "tda9887",
+ },
};
static int tda9887_init_module(void)
diff -Nru a/drivers/media/video/tuner-3036.c b/drivers/media/video/tuner-3036.c
--- a/drivers/media/video/tuner-3036.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/tuner-3036.c Sun Mar 23 00:11:01 2003
@@ -196,9 +196,11 @@
static struct i2c_client client_template {
- .name = "SAB3036",
.id = -1,
- .driver = &i2c_driver_tuner
+ .driver = &i2c_driver_tuner,
+ .dev = {
+ .name = "SAB3036",
+ },
};
int __init
diff -Nru a/drivers/media/video/tuner.c b/drivers/media/video/tuner.c
--- a/drivers/media/video/tuner.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/tuner.c Sun Mar 23 00:11:01 2003
@@ -226,7 +226,7 @@
{
unsigned char byte;
- struct tuner *t = (struct tuner*)c->data;
+ struct tuner *t = i2c_get_clientdata(c);
if (t->type = TUNER_MT2032)
return 0;
@@ -276,7 +276,7 @@
{
unsigned char buf[21];
int ret,xogc,xok=0;
- struct tuner *t = (struct tuner*)c->data;
+ struct tuner *t = i2c_get_clientdata(c);
buf[0]=0;
ret=i2c_master_send(c,buf,1);
@@ -517,7 +517,7 @@
{
unsigned char buf[21];
int lint_try,ret,sel,lock=0;
- struct tuner *t = (struct tuner*)c->data;
+ struct tuner *t = i2c_get_clientdata(c);
dprintk("mt2032_set_if_freq rfin=%d if1=%d if2=%d from=%d to=%d\n",rfin,if1,if2,from,to);
@@ -594,7 +594,7 @@
u8 config;
u16 div;
struct tunertype *tun;
- struct tuner *t = c->data;
+ struct tuner *t = i2c_get_clientdata(c);
unsigned char buffer[4];
int rc;
@@ -733,7 +733,7 @@
static void set_radio_freq(struct i2c_client *c, int freq)
{
struct tunertype *tun;
- struct tuner *t = (struct tuner*)c->data;
+ struct tuner *t = i2c_get_clientdata(c);
unsigned char buffer[4];
int rc,div;
@@ -794,16 +794,17 @@
if (NULL = (client = kmalloc(sizeof(struct i2c_client), GFP_KERNEL)))
return -ENOMEM;
memcpy(client,&client_template,sizeof(struct i2c_client));
- client->data = t = kmalloc(sizeof(struct tuner),GFP_KERNEL);
+ t = kmalloc(sizeof(struct tuner),GFP_KERNEL);
if (NULL = t) {
kfree(client);
return -ENOMEM;
}
+ i2c_set_clientdata(client, t);
memset(t,0,sizeof(struct tuner));
if (type >= 0 && type < TUNERS) {
t->type = type;
printk("tuner(bttv): type forced to %d (%s) [insmod]\n",t->type,tuners[t->type].name);
- strncpy(client->name, tuners[t->type].name, sizeof(client->name));
+ strncpy(client->dev.name, tuners[t->type].name, DEVICE_NAME_SIZE);
} else {
t->type = -1;
}
@@ -830,12 +831,12 @@
case I2C_ALGO_SAA7134:
case I2C_ALGO_SAA7146:
printk("tuner: probing %s i2c adapter [id=0x%x]\n",
- adap->name,adap->id);
+ adap->dev.name,adap->id);
rc = i2c_probe(adap, &addr_data, tuner_attach);
break;
default:
printk("tuner: ignoring %s i2c adapter [id=0x%x]\n",
- adap->name,adap->id);
+ adap->dev.name,adap->id);
rc = 0;
/* nothing */
}
@@ -844,7 +845,7 @@
static int tuner_detach(struct i2c_client *client)
{
- struct tuner *t = (struct tuner*)client->data;
+ struct tuner *t = i2c_get_clientdata(client);
i2c_detach_client(client);
kfree(t);
@@ -856,7 +857,7 @@
static int
tuner_command(struct i2c_client *client, unsigned int cmd, void *arg)
{
- struct tuner *t = (struct tuner*)client->data;
+ struct tuner *t = i2c_get_clientdata(client);
int *iarg = (int*)arg;
#if 0
__u16 *sarg = (__u16*)arg;
@@ -875,7 +876,7 @@
t->type = *iarg;
printk("tuner: type set to %d (%s)\n",
t->type,tuners[t->type].name);
- strncpy(client->name, tuners[t->type].name, sizeof(client->name));
+ strncpy(client->dev.name, tuners[t->type].name, DEVICE_NAME_SIZE);
if (t->type = TUNER_MT2032)
mt2032_init(client);
break;
@@ -977,9 +978,11 @@
};
static struct i2c_client client_template {
- .name = "(tuner unset)",
.flags = I2C_CLIENT_ALLOW_USE,
.driver = &driver,
+ .dev = {
+ .name = "(tuner unset)",
+ },
};
static int tuner_init_module(void)
diff -Nru a/drivers/media/video/tvaudio.c b/drivers/media/video/tvaudio.c
--- a/drivers/media/video/tvaudio.c Sun Mar 23 00:11:01 2003
+++ b/drivers/media/video/tvaudio.c Sun Mar 23 00:11:01 2003
@@ -161,22 +161,22 @@
unsigned char buffer[2];
if (-1 = subaddr) {
- dprintk("%s: chip_write: 0x%x\n", chip->c.name, val);
+ dprintk("%s: chip_write: 0x%x\n", chip->c.dev.name, val);
chip->shadow.bytes[1] = val;
buffer[0] = val;
if (1 != i2c_master_send(&chip->c,buffer,1)) {
printk(KERN_WARNING "%s: I/O error (write 0x%x)\n",
- chip->c.name, val);
+ chip->c.dev.name, val);
return -1;
}
} else {
- dprintk("%s: chip_write: reg%d=0x%x\n", chip->c.name, subaddr, val);
+ dprintk("%s: chip_write: reg%d=0x%x\n", chip->c.dev.name, subaddr, val);
chip->shadow.bytes[subaddr+1] = val;
buffer[0] = subaddr;
buffer[1] = val;
if (2 != i2c_master_send(&chip->c,buffer,2)) {
printk(KERN_WARNING "%s: I/O error (write reg%d=0x%x)\n",
- chip->c.name, subaddr, val);
+ chip->c.dev.name, subaddr, val);
return -1;
}
}
@@ -201,10 +201,10 @@
if (1 != i2c_master_recv(&chip->c,&buffer,1)) {
printk(KERN_WARNING "%s: I/O error (read)\n",
- chip->c.name);
+ chip->c.dev.name);
return -1;
}
- dprintk("%s: chip_read: 0x%x\n",chip->c.name,buffer);
+ dprintk("%s: chip_read: 0x%x\n",chip->c.dev.name,buffer);
return buffer;
}
@@ -220,11 +220,11 @@
if (2 != i2c_transfer(chip->c.adapter,msgs,2)) {
printk(KERN_WARNING "%s: I/O error (read2)\n",
- chip->c.name);
+ chip->c.dev.name);
return -1;
}
dprintk("%s: chip_read2: reg%d=0x%x\n",
- chip->c.name,subaddr,read[0]);
+ chip->c.dev.name,subaddr,read[0]);
return read[0];
}
@@ -237,7 +237,7 @@
/* update our shadow register set; print bytes if (debug > 0) */
dprintk("%s: chip_cmd(%s): reg=%d, data:",
- chip->c.name,name,cmd->bytes[0]);
+ chip->c.dev.name,name,cmd->bytes[0]);
for (i = 1; i < cmd->count; i++) {
dprintk(" 0x%x",cmd->bytes[i]);
chip->shadow.bytes[i+cmd->bytes[0]] = cmd->bytes[i];
@@ -246,7 +246,7 @@
/* send data to the chip */
if (cmd->count != i2c_master_send(&chip->c,cmd->bytes,cmd->count)) {
- printk(KERN_WARNING "%s: I/O error (%s)\n", chip->c.name, name);
+ printk(KERN_WARNING "%s: I/O error (%s)\n", chip->c.dev.name, name);
return -1;
}
return 0;
@@ -273,19 +273,19 @@
#ifdef CONFIG_SMP
lock_kernel();
#endif
- daemonize("%s", chip->c.name);
+ daemonize("%s", chip->c.dev.name);
chip->thread = current;
#ifdef CONFIG_SMP
unlock_kernel();
#endif
- dprintk("%s: thread started\n", chip->c.name);
+ dprintk("%s: thread started\n", chip->c.dev.name);
if(chip->notify != NULL)
up(chip->notify);
for (;;) {
interruptible_sleep_on(&chip->wq);
- dprintk("%s: thread wakeup\n", chip->c.name);
+ dprintk("%s: thread wakeup\n", chip->c.dev.name);
if (chip->done || signal_pending(current))
break;
@@ -301,7 +301,7 @@
}
chip->thread = NULL;
- dprintk("%s: thread exiting\n", chip->c.name);
+ dprintk("%s: thread exiting\n", chip->c.dev.name);
if(chip->notify != NULL)
up(chip->notify);
@@ -316,7 +316,7 @@
if (mode = chip->prevmode)
return;
- dprintk("%s: thread checkmode\n", chip->c.name);
+ dprintk("%s: thread checkmode\n", chip->c.dev.name);
chip->prevmode = mode;
if (mode & VIDEO_SOUND_STEREO)
@@ -1339,7 +1339,7 @@
memcpy(&chip->c,&client_template,sizeof(struct i2c_client));
chip->c.adapter = adap;
chip->c.addr = addr;
- chip->c.data = chip;
+ i2c_set_clientdata(&chip->c, chip);
/* find description for the chip */
dprintk("tvaudio: chip found @ i2c-addr=0x%x\n", addr<<1);
@@ -1364,7 +1364,7 @@
(desc->flags & CHIP_HAS_INPUTSEL) ? " audiomux" : "");
/* fill required data structures */
- strcpy(chip->c.name,desc->name);
+ strncpy(chip->c.dev.name, desc->name, DEVICE_NAME_SIZE);
chip->type = desc-chiplist;
chip->shadow.count = desc->registers+1;
chip->prevmode = -1;
@@ -1421,7 +1421,7 @@
static int chip_detach(struct i2c_client *client)
{
- struct CHIPSTATE *chip = client->data;
+ struct CHIPSTATE *chip = i2c_get_clientdata(client);
del_timer(&chip->wt);
if (NULL != chip->thread) {
@@ -1447,10 +1447,10 @@
unsigned int cmd, void *arg)
{
__u16 *sarg = arg;
- struct CHIPSTATE *chip = client->data;
+ struct CHIPSTATE *chip = i2c_get_clientdata(client);
struct CHIPDESC *desc = chiplist + chip->type;
- dprintk("%s: chip_command 0x%x\n",chip->c.name,cmd);
+ dprintk("%s: chip_command 0x%x\n",chip->c.dev.name,cmd);
switch (cmd) {
case AUDC_SET_INPUT:
@@ -1558,9 +1558,11 @@
static struct i2c_client client_template {
- .name = "(unset)",
.flags = I2C_CLIENT_ALLOW_USE,
.driver = &driver,
+ .dev = {
+ .name = "(unset)",
+ },
};
static int audiochip_init_module(void)
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH] Yet more i2c driver changes for 2.5.65
@ 2005-05-19 6:23 ` Greg KH
0 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw)
To: linux-kernel, sensors
ChangeSet 1.889.354.15, 2003/03/22 23:26:58-08:00, greg@kroah.com
i2c: fix up drivers/acorn/char/i2c.c due to previous i2c changes
I'm not going to touch the other driver in this directory, as it will
need more than just minor fixups to get correct.
diff -Nru a/drivers/acorn/char/i2c.c b/drivers/acorn/char/i2c.c
--- a/drivers/acorn/char/i2c.c Sun Mar 23 00:10:55 2003
+++ b/drivers/acorn/char/i2c.c Sun Mar 23 00:10:55 2003
@@ -303,11 +303,13 @@
}
static struct i2c_adapter ioc_ops = {
- .name = "IOC/IOMD",
.id = I2C_HW_B_IOC,
.algo_data = &ioc_data,
.client_register = ioc_client_reg,
.client_unregister = ioc_client_unreg
+ .dev = {
+ .name = "IOC/IOMD",
+ },
};
static int __init i2c_ioc_init(void)
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH] Yet more i2c driver changes for 2.5.65
@ 2005-05-19 6:23 ` Greg KH
0 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw)
To: linux-kernel, sensors
ChangeSet 1.889.354.16, 2003/03/22 23:29:40-08:00, greg@kroah.com
i2c: fix up drivers/ieee1394/pcilynx.c due to previous i2c changes.
diff -Nru a/drivers/ieee1394/pcilynx.c b/drivers/ieee1394/pcilynx.c
--- a/drivers/ieee1394/pcilynx.c Sun Mar 23 00:10:49 2003
+++ b/drivers/ieee1394/pcilynx.c Sun Mar 23 00:10:49 2003
@@ -138,10 +138,12 @@
};
static struct i2c_adapter bit_ops = {
- .name = "PCILynx I2C adapter",
.id = 0xAA, //FIXME: probably we should get an id in i2c-id.h
.client_register = bit_reg,
.client_unregister = bit_unreg,
+ .dev = {
+ .name = "PCILynx I2C",
+ },
};
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH] Yet more i2c driver changes for 2.5.65
@ 2005-05-19 6:23 ` Greg KH
0 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw)
To: linux-kernel, sensors
ChangeSet 1.987, 2003/03/23 00:06:48-08:00, greg@kroah.com
i2c: fix up drivers/video/matrox/i2c-matroxfb.c due to previous i2c changes
diff -Nru a/drivers/video/matrox/i2c-matroxfb.c b/drivers/video/matrox/i2c-matroxfb.c
--- a/drivers/video/matrox/i2c-matroxfb.c Sun Mar 23 00:10:43 2003
+++ b/drivers/video/matrox/i2c-matroxfb.c Sun Mar 23 00:10:43 2003
@@ -111,7 +111,8 @@
b->mask.data = data;
b->mask.clock = clock;
b->adapter = matrox_i2c_adapter_template;
- sprintf(b->adapter.name, name, minor(minfo->fbcon.node));
+ snprintf(b->adapter.dev.name, DEVICE_NAME_SIZE, name,
+ minor(minfo->fbcon.node));
b->adapter.data = b;
b->adapter.algo_data = &b->bac;
b->bac = matrox_i2c_algo_template;
@@ -159,22 +160,22 @@
switch (ACCESS_FBINFO(chip)) {
case MGA_2064:
case MGA_2164:
- err = i2c_bus_reg(&m2info->ddc1, minfo, DDC1B_DATA, DDC1B_CLK, "DDC:fb%u #0 on i2c-matroxfb");
+ err = i2c_bus_reg(&m2info->ddc1, minfo, DDC1B_DATA, DDC1B_CLK, "DDC:fb%u #0");
break;
default:
- err = i2c_bus_reg(&m2info->ddc1, minfo, DDC1_DATA, DDC1_CLK, "DDC:fb%u #0 on i2c-matroxfb");
+ err = i2c_bus_reg(&m2info->ddc1, minfo, DDC1_DATA, DDC1_CLK, "DDC:fb%u #0");
break;
}
if (err)
goto fail_ddc1;
if (ACCESS_FBINFO(devflags.dualhead)) {
- err = i2c_bus_reg(&m2info->ddc2, minfo, DDC2_DATA, DDC2_CLK, "DDC:fb%u #1 on i2c-matroxfb");
+ err = i2c_bus_reg(&m2info->ddc2, minfo, DDC2_DATA, DDC2_CLK, "DDC:fb%u #1");
if (err = -ENODEV) {
printk(KERN_INFO "i2c-matroxfb: VGA->TV plug detected, DDC unavailable.\n");
} else if (err)
printk(KERN_INFO "i2c-matroxfb: Could not register secondary output i2c bus. Continuing anyway.\n");
/* Register maven bus even on G450/G550 */
- err = i2c_bus_reg(&m2info->maven, minfo, MAT_DATA, MAT_CLK, "MAVEN:fb%u on i2c-matroxfb");
+ err = i2c_bus_reg(&m2info->maven, minfo, MAT_DATA, MAT_CLK, "MAVEN:fb%u");
if (err)
printk(KERN_INFO "i2c-matroxfb: Could not register Maven i2c bus. Continuing anyway.\n");
}
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH] Yet more i2c driver changes for 2.5.69
@ 2005-05-19 6:23 ` Greg KH
0 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw)
To: linux-kernel, sensors
ChangeSet 1.1093.2.2, 2003/05/13 13:48:50-07:00, mhoffman@lightlink.com
[PATCH] i2c: Add SiS96x I2C/SMBus driver
This patch adds support for the SMBus of SiS96x south
bridges. It is based on i2c-sis645.c from the lm sensors
project, which never made it into an official kernel and
was anyway mis-named.
This driver works on my SiS 645/961 board vs w83781d.
drivers/i2c/busses/Kconfig | 25 ++
drivers/i2c/busses/Makefile | 1
drivers/i2c/busses/i2c-sis96x.c | 376 ++++++++++++++++++++++++++++++++++++++++
drivers/pci/quirks.c | 40 ++++
include/linux/i2c-id.h | 2
include/linux/pci_ids.h | 3
6 files changed, 446 insertions(+), 1 deletion(-)
diff -Nru a/drivers/i2c/busses/Kconfig b/drivers/i2c/busses/Kconfig
--- a/drivers/i2c/busses/Kconfig Mon May 19 15:59:03 2003
+++ b/drivers/i2c/busses/Kconfig Mon May 19 15:59:03 2003
@@ -117,6 +117,31 @@
http://www.lm-sensors.nu
+config I2C_SIS96X
+ tristate " SiS 96x"
+ depends on I2C && PCI && EXPERIMENTAL
+ help
+ If you say yes to this option, support will be included for the SiS
+ 96x SMBus (a subset of I2C) interfaces. Specifically, the following
+ chipsets are supported:
+ 645/961
+ 645DX/961
+ 645DX/962
+ 648/961
+ 650/961
+ 735
+
+ This can also be built as a module which can be inserted and removed
+ while the kernel is running. If you want to compile it as a module,
+ say M here and read <file:Documentation/modules.txt>.
+
+ The module will be called i2c-sis96x.
+
+ You will also need the latest user-space utilties: you can find them
+ in the lm_sensors package, which you can download at
+ http://www.lm-sensors.nu
+
+
config I2C_VIAPRO
tristate " VIA 82C596/82C686/823x"
depends on I2C && PCI && EXPERIMENTAL
diff -Nru a/drivers/i2c/busses/Makefile b/drivers/i2c/busses/Makefile
--- a/drivers/i2c/busses/Makefile Mon May 19 15:59:03 2003
+++ b/drivers/i2c/busses/Makefile Mon May 19 15:59:03 2003
@@ -8,4 +8,5 @@
obj-$(CONFIG_I2C_I801) += i2c-i801.o
obj-$(CONFIG_I2C_ISA) += i2c-isa.o
obj-$(CONFIG_I2C_PIIX4) += i2c-piix4.o
+obj-$(CONFIG_I2C_SIS96X) += i2c-sis96x.o
obj-$(CONFIG_I2C_VIAPRO) += i2c-viapro.o
diff -Nru a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c
--- /dev/null Wed Dec 31 16:00:00 1969
+++ b/drivers/i2c/busses/i2c-sis96x.c Mon May 19 15:59:03 2003
@@ -0,0 +1,376 @@
+/*
+ sis96x.c - Part of lm_sensors, Linux kernel modules for hardware
+ monitoring
+
+ Copyright (c) 2003 Mark M. Hoffman <mhoffman@lightlink.com>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+/*
+ This module must be considered BETA unless and until
+ the chipset manufacturer releases a datasheet.
+ The register definitions are based on the SiS630.
+
+ This module relies on quirk_sis_96x_smbus (drivers/pci/quirks.c)
+ for just about every machine for which users have reported.
+ If this module isn't detecting your 96x south bridge, have a
+ look there.
+
+ We assume there can only be one SiS96x with one SMBus interface.
+*/
+
+/* #define DEBUG */
+
+#include <linux/module.h>
+#include <linux/pci.h>
+#include <linux/kernel.h>
+#include <linux/stddef.h>
+#include <linux/sched.h>
+#include <linux/ioport.h>
+#include <linux/i2c.h>
+#include <linux/init.h>
+#include <asm/io.h>
+
+/*
+ HISTORY:
+ 2003-05-11 1.0.0 Updated from lm_sensors project for kernel 2.5
+ (was i2c-sis645.c from lm_sensors 2.7.0)
+*/
+#define SIS96x_VERSION "1.0.0"
+
+/* SiS96x SMBus PCI device ID */
+#define PCI_DEVICE_ID_SI_SMBUS 0x16
+
+/* base address register in PCI config space */
+#define SIS96x_BAR 0x04
+
+/* SiS96x SMBus registers */
+#define SMB_STS 0x00
+#define SMB_EN 0x01
+#define SMB_CNT 0x02
+#define SMB_HOST_CNT 0x03
+#define SMB_ADDR 0x04
+#define SMB_CMD 0x05
+#define SMB_PCOUNT 0x06
+#define SMB_COUNT 0x07
+#define SMB_BYTE 0x08
+#define SMB_DEV_ADDR 0x10
+#define SMB_DB0 0x11
+#define SMB_DB1 0x12
+#define SMB_SAA 0x13
+
+/* register count for request_region */
+#define SMB_IOSIZE 0x20
+
+/* Other settings */
+#define MAX_TIMEOUT 500
+
+/* SiS96x SMBus constants */
+#define SIS96x_QUICK 0x00
+#define SIS96x_BYTE 0x01
+#define SIS96x_BYTE_DATA 0x02
+#define SIS96x_WORD_DATA 0x03
+#define SIS96x_PROC_CALL 0x04
+#define SIS96x_BLOCK_DATA 0x05
+
+static struct i2c_adapter sis96x_adapter;
+static u16 sis96x_smbus_base = 0;
+
+static inline u8 sis96x_read(u8 reg)
+{
+ return inb(sis96x_smbus_base + reg) ;
+}
+
+static inline void sis96x_write(u8 reg, u8 data)
+{
+ outb(data, sis96x_smbus_base + reg) ;
+}
+
+/* Internally used pause function */
+static void sis96x_do_pause(unsigned int amount)
+{
+ current->state = TASK_INTERRUPTIBLE;
+ schedule_timeout(amount);
+}
+
+/* Execute a SMBus transaction.
+ int size is from SIS96x_QUICK to SIS96x_BLOCK_DATA
+ */
+static int sis96x_transaction(int size)
+{
+ int temp;
+ int result = 0;
+ int timeout = 0;
+
+ dev_dbg(&sis96x_adapter.dev, "SMBus transaction %d\n", size);
+
+ /* Make sure the SMBus host is ready to start transmitting */
+ if (((temp = sis96x_read(SMB_CNT)) & 0x03) != 0x00) {
+
+ dev_dbg(&sis96x_adapter.dev, "SMBus busy (0x%02x). "
+ "Resetting...\n", temp);
+
+ /* kill the transaction */
+ sis96x_write(SMB_HOST_CNT, 0x20);
+
+ /* check it again */
+ if (((temp = sis96x_read(SMB_CNT)) & 0x03) != 0x00) {
+ dev_dbg(&sis96x_adapter.dev, "Failed (0x%02x)\n", temp);
+ return -1;
+ } else {
+ dev_dbg(&sis96x_adapter.dev, "Successful\n");
+ }
+ }
+
+ /* Turn off timeout interrupts, set fast host clock */
+ sis96x_write(SMB_CNT, 0x20);
+
+ /* clear all (sticky) status flags */
+ temp = sis96x_read(SMB_STS);
+ sis96x_write(SMB_STS, temp & 0x1e);
+
+ /* start the transaction by setting bit 4 and size bits */
+ sis96x_write(SMB_HOST_CNT, 0x10 | (size & 0x07));
+
+ /* We will always wait for a fraction of a second! */
+ do {
+ sis96x_do_pause(1);
+ temp = sis96x_read(SMB_STS);
+ } while (!(temp & 0x0e) && (timeout++ < MAX_TIMEOUT));
+
+ /* If the SMBus is still busy, we give up */
+ if (timeout >= MAX_TIMEOUT) {
+ dev_dbg(&sis96x_adapter.dev, "SMBus Timeout! (0x%02x)\n", temp);
+ result = -1;
+ }
+
+ /* device error - probably missing ACK */
+ if (temp & 0x02) {
+ dev_dbg(&sis96x_adapter.dev, "Failed bus transaction!\n");
+ result = -1;
+ }
+
+ /* bus collision */
+ if (temp & 0x04) {
+ dev_dbg(&sis96x_adapter.dev, "Bus collision!\n");
+ result = -1;
+ }
+
+ /* Finish up by resetting the bus */
+ sis96x_write(SMB_STS, temp);
+ if ((temp = sis96x_read(SMB_STS))) {
+ dev_dbg(&sis96x_adapter.dev, "Failed reset at "
+ "end of transaction! (0x%02x)\n", temp);
+ }
+
+ return result;
+}
+
+/* Return -1 on error. */
+static s32 sis96x_access(struct i2c_adapter * adap, u16 addr,
+ unsigned short flags, char read_write,
+ u8 command, int size, union i2c_smbus_data * data)
+{
+
+ switch (size) {
+ case I2C_SMBUS_QUICK:
+ sis96x_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01));
+ size = SIS96x_QUICK;
+ break;
+
+ case I2C_SMBUS_BYTE:
+ sis96x_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01));
+ if (read_write = I2C_SMBUS_WRITE)
+ sis96x_write(SMB_CMD, command);
+ size = SIS96x_BYTE;
+ break;
+
+ case I2C_SMBUS_BYTE_DATA:
+ sis96x_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01));
+ sis96x_write(SMB_CMD, command);
+ if (read_write = I2C_SMBUS_WRITE)
+ sis96x_write(SMB_BYTE, data->byte);
+ size = SIS96x_BYTE_DATA;
+ break;
+
+ case I2C_SMBUS_PROC_CALL:
+ case I2C_SMBUS_WORD_DATA:
+ sis96x_write(SMB_ADDR, ((addr & 0x7f) << 1) | (read_write & 0x01));
+ sis96x_write(SMB_CMD, command);
+ if (read_write = I2C_SMBUS_WRITE) {
+ sis96x_write(SMB_BYTE, data->word & 0xff);
+ sis96x_write(SMB_BYTE + 1, (data->word & 0xff00) >> 8);
+ }
+ size = (size = I2C_SMBUS_PROC_CALL ?
+ SIS96x_PROC_CALL : SIS96x_WORD_DATA);
+ break;
+
+ case I2C_SMBUS_BLOCK_DATA:
+ /* TO DO: */
+ dev_info(&adap->dev, "SMBus block not implemented!\n");
+ return -1;
+ break;
+
+ default:
+ dev_info(&adap->dev, "Unsupported I2C size\n");
+ return -1;
+ break;
+ }
+
+ if (sis96x_transaction(size))
+ return -1;
+
+ if ((size != SIS96x_PROC_CALL) &&
+ ((read_write = I2C_SMBUS_WRITE) || (size = SIS96x_QUICK)))
+ return 0;
+
+ switch (size) {
+ case SIS96x_BYTE:
+ case SIS96x_BYTE_DATA:
+ data->byte = sis96x_read(SMB_BYTE);
+ break;
+
+ case SIS96x_WORD_DATA:
+ case SIS96x_PROC_CALL:
+ data->word = sis96x_read(SMB_BYTE) +
+ (sis96x_read(SMB_BYTE + 1) << 8);
+ break;
+ }
+ return 0;
+}
+
+static u32 sis96x_func(struct i2c_adapter *adapter)
+{
+ return I2C_FUNC_SMBUS_QUICK | I2C_FUNC_SMBUS_BYTE |
+ I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA |
+ I2C_FUNC_SMBUS_PROC_CALL;
+}
+
+static struct i2c_algorithm smbus_algorithm = {
+ .name = "Non-I2C SMBus adapter",
+ .id = I2C_ALGO_SMBUS,
+ .smbus_xfer = sis96x_access,
+ .functionality = sis96x_func,
+};
+
+static struct i2c_adapter sis96x_adapter = {
+ .owner = THIS_MODULE,
+ .id = I2C_ALGO_SMBUS | I2C_HW_SMBUS_SIS96X,
+ .class = I2C_ADAP_CLASS_SMBUS,
+ .algo = &smbus_algorithm,
+ .dev = {
+ .name ="unset",
+ },
+};
+
+static struct pci_device_id sis96x_ids[] __devinitdata = {
+
+ {
+ .vendor = PCI_VENDOR_ID_SI,
+ .device = PCI_DEVICE_ID_SI_SMBUS,
+ .subvendor = PCI_ANY_ID,
+ .subdevice = PCI_ANY_ID,
+ },
+
+ { 0, }
+};
+
+static int __devinit sis96x_probe(struct pci_dev *dev,
+ const struct pci_device_id *id)
+{
+ u16 ww = 0;
+ int retval;
+
+ if (sis96x_smbus_base) {
+ dev_err(&dev->dev, "Only one device supported.\n");
+ return -EBUSY;
+ }
+
+ pci_read_config_word(dev, PCI_CLASS_DEVICE, &ww);
+ if (PCI_CLASS_SERIAL_SMBUS != ww) {
+ dev_err(&dev->dev, "Unsupported device class 0x%04x!\n", ww);
+ return -ENODEV;
+ }
+
+ sis96x_smbus_base = pci_resource_start(dev, SIS96x_BAR);
+ if (!sis96x_smbus_base) {
+ dev_err(&dev->dev, "SiS96x SMBus base address "
+ "not initialized!\n");
+ return -EINVAL;
+ }
+ dev_info(&dev->dev, "SiS96x SMBus base address: 0x%04x\n",
+ sis96x_smbus_base);
+
+ /* Everything is happy, let's grab the memory and set things up. */
+ if (!request_region(sis96x_smbus_base, SMB_IOSIZE, "sis96x-smbus")) {
+ dev_err(&dev->dev, "SMBus registers 0x%04x-0x%04x "
+ "already in use!\n", sis96x_smbus_base,
+ sis96x_smbus_base + SMB_IOSIZE - 1);
+
+ sis96x_smbus_base = 0;
+ return -EINVAL;
+ }
+
+ /* set up the driverfs linkage to our parent device */
+ sis96x_adapter.dev.parent = &dev->dev;
+
+ snprintf(sis96x_adapter.dev.name, DEVICE_NAME_SIZE,
+ "SiS96x SMBus adapter at 0x%04x", sis96x_smbus_base);
+
+ if ((retval = i2c_add_adapter(&sis96x_adapter))) {
+ dev_err(&dev->dev, "Couldn't register adapter!\n");
+ release_region(sis96x_smbus_base, SMB_IOSIZE);
+ sis96x_smbus_base = 0;
+ }
+
+ return retval;
+}
+
+static void __devexit sis96x_remove(struct pci_dev *dev)
+{
+ if (sis96x_smbus_base) {
+ i2c_del_adapter(&sis96x_adapter);
+ release_region(sis96x_smbus_base, SMB_IOSIZE);
+ sis96x_smbus_base = 0;
+ }
+}
+
+static struct pci_driver sis96x_driver = {
+ .name = "sis96x smbus",
+ .id_table = sis96x_ids,
+ .probe = sis96x_probe,
+ .remove = __devexit_p(sis96x_remove),
+};
+
+static int __init i2c_sis96x_init(void)
+{
+ printk(KERN_INFO "i2c-sis96x version %s\n", SIS96x_VERSION);
+ return pci_module_init(&sis96x_driver);
+}
+
+static void __exit i2c_sis96x_exit(void)
+{
+ pci_unregister_driver(&sis96x_driver);
+}
+
+MODULE_AUTHOR("Mark M. Hoffman <mhoffman@lightlink.com>");
+MODULE_DESCRIPTION("SiS96x SMBus driver");
+MODULE_LICENSE("GPL");
+
+/* Register initialization functions using helper macros */
+module_init(i2c_sis96x_init);
+module_exit(i2c_sis96x_exit);
+
diff -Nru a/drivers/pci/quirks.c b/drivers/pci/quirks.c
--- a/drivers/pci/quirks.c Mon May 19 15:59:03 2003
+++ b/drivers/pci/quirks.c Mon May 19 15:59:03 2003
@@ -647,6 +647,37 @@
}
/*
+ * SiS 96x south bridge: BIOS typically hides SMBus device...
+ */
+static void __init quirk_sis_96x_smbus(struct pci_dev *dev)
+{
+ u8 val = 0;
+ printk(KERN_INFO "Enabling SiS 96x SMBus.\n");
+ pci_read_config_byte(dev, 0x77, &val);
+ pci_write_config_byte(dev, 0x77, val & ~0x10);
+ pci_read_config_byte(dev, 0x77, &val);
+}
+
+/*
+ * ... This is further complicated by the fact that some SiS96x south
+ * bridges pretend to be 85C503/5513 instead. In that case see if we
+ * spotted a compatible north bridge to make sure.
+ * (pci_find_device doesn't work yet)
+ */
+static int __devinitdata sis_96x_compatible = 0;
+
+static void __init quirk_sis_503_smbus(struct pci_dev *dev)
+{
+ if (sis_96x_compatible)
+ quirk_sis_96x_smbus(dev);
+}
+
+static void __init quirk_sis_96x_compatible(struct pci_dev *dev)
+{
+ sis_96x_compatible = 1;
+}
+
+/*
* The main table of quirks.
*/
@@ -679,6 +710,15 @@
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82443BX_2, quirk_natoma },
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_5597, quirk_nopcipci },
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_496, quirk_nopcipci },
+ { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_503, quirk_sis_503_smbus },
+ { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_645, quirk_sis_96x_compatible },
+ { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_646, quirk_sis_96x_compatible },
+ { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_648, quirk_sis_96x_compatible },
+ { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_650, quirk_sis_96x_compatible },
+ { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_651, quirk_sis_96x_compatible },
+ { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_961, quirk_sis_96x_smbus },
+ { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_962, quirk_sis_96x_smbus },
+ { PCI_FIXUP_HEADER, PCI_VENDOR_ID_SI, PCI_DEVICE_ID_SI_963, quirk_sis_96x_smbus },
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1647, quirk_alimagik },
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_AL, PCI_DEVICE_ID_AL_M1651, quirk_alimagik },
{ PCI_FIXUP_FINAL, PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_8363_0, quirk_vialatency },
diff -Nru a/include/linux/i2c-id.h b/include/linux/i2c-id.h
--- a/include/linux/i2c-id.h Mon May 19 15:59:03 2003
+++ b/include/linux/i2c-id.h Mon May 19 15:59:03 2003
@@ -245,7 +245,7 @@
#define I2C_HW_SMBUS_SIS5595 0x06
#define I2C_HW_SMBUS_ALI1535 0x07
#define I2C_HW_SMBUS_SIS630 0x08
-#define I2C_HW_SMBUS_SIS645 0x09
+#define I2C_HW_SMBUS_SIS96X 0x09
#define I2C_HW_SMBUS_AMD8111 0x0a
#define I2C_HW_SMBUS_SCX200 0x0b
#define I2C_HW_SMBUS_NFORCE2 0x0c
diff -Nru a/include/linux/pci_ids.h b/include/linux/pci_ids.h
--- a/include/linux/pci_ids.h Mon May 19 15:59:03 2003
+++ b/include/linux/pci_ids.h Mon May 19 15:59:03 2003
@@ -569,6 +569,9 @@
#define PCI_DEVICE_ID_SI_751 0x0751
#define PCI_DEVICE_ID_SI_752 0x0752
#define PCI_DEVICE_ID_SI_900 0x0900
+#define PCI_DEVICE_ID_SI_961 0x0961
+#define PCI_DEVICE_ID_SI_962 0x0962
+#define PCI_DEVICE_ID_SI_963 0x0963
#define PCI_DEVICE_ID_SI_5107 0x5107
#define PCI_DEVICE_ID_SI_5300 0x5300
#define PCI_DEVICE_ID_SI_5511 0x5511
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH] Yet more i2c driver changes for 2.5.69
@ 2005-05-19 6:23 ` Greg KH
0 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw)
To: linux-kernel, sensors
ChangeSet 1.1093.2.3, 2003/05/19 10:37:20-07:00, warp@mercury.d2dc.net
[PATCH] I2C: And yet another it87 patch.
Trivial, but important.
Somehow in the patching the bk tree somehow got two memset's to clear
new_client in it87_detect, normally while this would be bad, it would
not be critical.
However one of the two happens BEFORE the variable is set, and thus
things go badly.
drivers/i2c/chips/it87.c | 1 -
1 files changed, 1 deletion(-)
diff -Nru a/drivers/i2c/chips/it87.c b/drivers/i2c/chips/it87.c
--- a/drivers/i2c/chips/it87.c Mon May 19 15:58:52 2003
+++ b/drivers/i2c/chips/it87.c Mon May 19 15:58:52 2003
@@ -630,7 +630,6 @@
}
}
}
- memset (new_client, 0x00, sizeof(struct i2c_client) + sizeof(struct it87_data));
/* OK. For now, we presume we have a valid client. We now create the
client structure, even though we cannot fill it completely yet.
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH] Yet more i2c driver changes for 2.5.69
@ 2005-05-19 6:23 ` Greg KH
0 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw)
To: linux-kernel, sensors
ChangeSet 1.1093.2.1, 2003/05/13 12:33:20-07:00, greg@kroah.com
[PATCH] i2c: piix4 driver: turn common error message to a debug level and rename the sysfs driver name.
drivers/i2c/busses/i2c-piix4.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff -Nru a/drivers/i2c/busses/i2c-piix4.c b/drivers/i2c/busses/i2c-piix4.c
--- a/drivers/i2c/busses/i2c-piix4.c Mon May 19 15:59:14 2003
+++ b/drivers/i2c/busses/i2c-piix4.c Mon May 19 15:59:14 2003
@@ -269,7 +269,7 @@
if (temp & 0x04) {
result = -1;
- dev_err(&piix4_adapter.dev, "Error: no response!\n");
+ dev_dbg(&piix4_adapter.dev, "Error: no response!\n");
}
if (inb_p(SMBHSTSTS) != 0x00)
@@ -467,7 +467,7 @@
static struct pci_driver piix4_driver = {
- .name = "piix4 smbus",
+ .name = "piix4-smbus",
.id_table = piix4_ids,
.probe = piix4_probe,
.remove = __devexit_p(piix4_remove),
^ permalink raw reply [flat|nested] 20+ messages in thread
* [PATCH] Yet more i2c driver changes for 2.5.69
@ 2005-05-19 6:23 ` Greg KH
0 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw)
To: linux-kernel, sensors
ChangeSet 1.1093.2.4, 2003/05/19 15:32:55-07:00, greg@kroah.com
i2c: fix up i2c-dev driver based on previous core changes.
This fixes the problem that adapter id's are not the minor number for the
i2c-dev devices anymore. Also adds a i2c-dev class to let userspace know
which i2c-dev device is bound to which i2c adapter.
drivers/i2c/i2c-dev.c | 228 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 160 insertions(+), 68 deletions(-)
diff -Nru a/drivers/i2c/i2c-dev.c b/drivers/i2c/i2c-dev.c
--- a/drivers/i2c/i2c-dev.c Mon May 19 15:58:41 2003
+++ b/drivers/i2c/i2c-dev.c Mon May 19 15:58:41 2003
@@ -3,6 +3,7 @@
Copyright (C) 1995-97 Simon G. Vogl
Copyright (C) 1998-99 Frodo Looijaard <frodol@dds.nl>
+ Copyright (C) 2003 Greg Kroah-Hartman <greg@kroah.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -28,8 +29,6 @@
/* The devfs code is contributed by Philipp Matthias Hahn
<pmhahn@titan.lahn.de> */
-/* $Id: i2c-dev.c,v 1.53 2003/01/21 08:08:16 kmalkki Exp $ */
-
/* If you want debugging uncomment: */
/* #define DEBUG 1 */
@@ -44,54 +43,84 @@
#include <linux/i2c-dev.h>
#include <asm/uaccess.h>
-/* struct file_operations changed too often in the 2.1 series for nice code */
-
-static ssize_t i2cdev_read (struct file *file, char *buf, size_t count,
- loff_t *offset);
-static ssize_t i2cdev_write (struct file *file, const char *buf, size_t count,
- loff_t *offset);
-
-static int i2cdev_ioctl (struct inode *inode, struct file *file,
- unsigned int cmd, unsigned long arg);
-static int i2cdev_open (struct inode *inode, struct file *file);
-
-static int i2cdev_release (struct inode *inode, struct file *file);
-
-static int i2cdev_attach_adapter(struct i2c_adapter *adap);
-static int i2cdev_detach_adapter(struct i2c_adapter *adap);
-static int i2cdev_detach_client(struct i2c_client *client);
-static int i2cdev_command(struct i2c_client *client, unsigned int cmd,
- void *arg);
+static struct i2c_client i2cdev_client_template;
-static struct file_operations i2cdev_fops = {
- .owner = THIS_MODULE,
- .llseek = no_llseek,
- .read = i2cdev_read,
- .write = i2cdev_write,
- .ioctl = i2cdev_ioctl,
- .open = i2cdev_open,
- .release = i2cdev_release,
+struct i2c_dev {
+ int minor;
+ struct i2c_adapter *adap;
+ struct class_device class_dev;
};
+#define to_i2c_dev(d) container_of(d, struct i2c_dev, class_dev)
-static struct i2c_driver i2cdev_driver = {
- .owner = THIS_MODULE,
- .name = "dev driver",
- .id = I2C_DRIVERID_I2CDEV,
- .flags = I2C_DF_NOTIFY,
- .attach_adapter = i2cdev_attach_adapter,
- .detach_adapter = i2cdev_detach_adapter,
- .detach_client = i2cdev_detach_client,
- .command = i2cdev_command,
-};
+#define I2C_MINORS 256
+static struct i2c_dev *i2c_dev_array[I2C_MINORS];
+static spinlock_t i2c_dev_array_lock = SPIN_LOCK_UNLOCKED;
-static struct i2c_client i2cdev_client_template = {
- .dev = {
- .name = "I2C /dev entry",
- },
- .id = 1,
- .addr = -1,
- .driver = &i2cdev_driver,
-};
+struct i2c_dev *i2c_dev_get_by_minor(unsigned index)
+{
+ struct i2c_dev *i2c_dev;
+
+ spin_lock(&i2c_dev_array_lock);
+ i2c_dev = i2c_dev_array[index];
+ spin_unlock(&i2c_dev_array_lock);
+ return i2c_dev;
+}
+
+struct i2c_dev *i2c_dev_get_by_adapter(struct i2c_adapter *adap)
+{
+ struct i2c_dev *i2c_dev = NULL;
+ int i;
+
+ spin_lock(&i2c_dev_array_lock);
+ for (i = 0; i < I2C_MINORS; ++i) {
+ if ((i2c_dev_array[i]) &&
+ (i2c_dev_array[i]->adap = adap)) {
+ i2c_dev = i2c_dev_array[i];
+ break;
+ }
+ }
+ spin_unlock(&i2c_dev_array_lock);
+ return i2c_dev;
+}
+
+static struct i2c_dev *get_free_i2c_dev(void)
+{
+ struct i2c_dev *i2c_dev;
+ unsigned int i;
+
+ i2c_dev = kmalloc(sizeof(*i2c_dev), GFP_KERNEL);
+ if (!i2c_dev)
+ return ERR_PTR(-ENOMEM);
+ memset(i2c_dev, 0x00, sizeof(*i2c_dev));
+
+ spin_lock(&i2c_dev_array_lock);
+ for (i = 0; i < I2C_MINORS; ++i) {
+ if (i2c_dev_array[i])
+ continue;
+ i2c_dev->minor = i;
+ i2c_dev_array[i] = i2c_dev;
+ spin_unlock(&i2c_dev_array_lock);
+ return i2c_dev;
+ }
+ spin_unlock(&i2c_dev_array_lock);
+ kfree(i2c_dev);
+ return ERR_PTR(-ENODEV);
+}
+
+static void return_i2c_dev(struct i2c_dev *i2c_dev)
+{
+ spin_lock(&i2c_dev_array_lock);
+ i2c_dev_array[i2c_dev->minor] = NULL;
+ spin_unlock(&i2c_dev_array_lock);
+ kfree(i2c_dev);
+}
+
+static ssize_t show_dev(struct class_device *class_dev, char *buf)
+{
+ struct i2c_dev *i2c_dev = to_i2c_dev(class_dev);
+ return sprintf(buf, "%04x\n", MKDEV(I2C_MAJOR, i2c_dev->minor));
+}
+static CLASS_DEVICE_ATTR(dev, S_IRUGO, show_dev, NULL);
static ssize_t i2cdev_read (struct file *file, char *buf, size_t count,
loff_t *offset)
@@ -104,7 +133,6 @@
if (count > 8192)
count = 8192;
- /* copy user space data to kernel space. */
tmp = kmalloc(count,GFP_KERNEL);
if (tmp=NULL)
return -ENOMEM;
@@ -129,7 +157,6 @@
if (count > 8192)
count = 8192;
- /* copy user space data to kernel space. */
tmp = kmalloc(count,GFP_KERNEL);
if (tmp=NULL)
return -ENOMEM;
@@ -157,7 +184,7 @@
int i,datasize,res;
unsigned long funcs;
- pr_debug("i2c-dev.o: i2c-%d ioctl, cmd: 0x%x, arg: %lx.\n",
+ dev_dbg(&client->dev, "i2c-%d ioctl, cmd: 0x%x, arg: %lx.\n",
minor(inode->i_rdev),cmd, arg);
switch ( cmd ) {
@@ -242,13 +269,11 @@
rdwr_arg.nmsgs);
}
while(i-- > 0) {
- if( res>=0 && (rdwr_pa[i].flags & I2C_M_RD))
- {
+ if( res>=0 && (rdwr_pa[i].flags & I2C_M_RD)) {
if(copy_to_user(
rdwr_arg.msgs[i].buf,
rdwr_pa[i].buf,
- rdwr_pa[i].len))
- {
+ rdwr_pa[i].len)) {
res = -EFAULT;
}
}
@@ -340,9 +365,14 @@
unsigned int minor = minor(inode->i_rdev);
struct i2c_client *client;
struct i2c_adapter *adap;
+ struct i2c_dev *i2c_dev;
- adap = i2c_get_adapter(minor);
- if (NULL = adap)
+ i2c_dev = i2c_dev_get_by_minor(minor);
+ if (!i2c_dev)
+ return -ENODEV;
+
+ adap = i2c_get_adapter(i2c_dev->adap->nr);
+ if (!adap)
return -ENODEV;
client = kmalloc(sizeof(*client), GFP_KERNEL);
@@ -370,29 +400,68 @@
return 0;
}
-int i2cdev_attach_adapter(struct i2c_adapter *adap)
+static struct file_operations i2cdev_fops = {
+ .owner = THIS_MODULE,
+ .llseek = no_llseek,
+ .read = i2cdev_read,
+ .write = i2cdev_write,
+ .ioctl = i2cdev_ioctl,
+ .open = i2cdev_open,
+ .release = i2cdev_release,
+};
+
+static struct class i2c_dev_class = {
+ .name = "i2c-dev",
+};
+
+static int i2cdev_attach_adapter(struct i2c_adapter *adap)
{
- int i;
+ struct i2c_dev *i2c_dev;
+ int retval;
- i = i2c_adapter_id(adap);
- devfs_mk_cdev(MKDEV(I2C_MAJOR, i),
- S_IFCHR|S_IRUSR|S_IWUSR, "i2c/%d", i);
- dev_dbg(&adap->dev, "Registered as minor %d\n", i);
+ i2c_dev = get_free_i2c_dev();
+ if (IS_ERR(i2c_dev))
+ return PTR_ERR(i2c_dev);
+
+ devfs_mk_cdev(MKDEV(I2C_MAJOR, i2c_dev->minor),
+ S_IFCHR|S_IRUSR|S_IWUSR, "i2c/%d", i2c_dev->minor);
+ dev_dbg(&adap->dev, "Registered as minor %d\n", i2c_dev->minor);
+
+ /* register this i2c device with the driver core */
+ i2c_dev->adap = adap;
+ if (adap->dev.parent = &legacy_bus)
+ i2c_dev->class_dev.dev = &adap->dev;
+ else
+ i2c_dev->class_dev.dev = adap->dev.parent;
+ i2c_dev->class_dev.class = &i2c_dev_class;
+ snprintf(i2c_dev->class_dev.class_id, BUS_ID_SIZE, "i2c-%d", i2c_dev->minor);
+ retval = class_device_register(&i2c_dev->class_dev);
+ if (retval)
+ goto error;
+ class_device_create_file(&i2c_dev->class_dev, &class_device_attr_dev);
return 0;
+error:
+ return_i2c_dev(i2c_dev);
+ return retval;
}
-int i2cdev_detach_adapter(struct i2c_adapter *adap)
+static int i2cdev_detach_adapter(struct i2c_adapter *adap)
{
- int i;
+ struct i2c_dev *i2c_dev;
- i = i2c_adapter_id(adap);
+ i2c_dev = i2c_dev_get_by_adapter(adap);
+ if (!i2c_dev)
+ return -ENODEV;
+
+ class_device_unregister(&i2c_dev->class_dev);
+ devfs_remove("i2c/%d", i2c_dev->minor);
+ return_i2c_dev(i2c_dev);
- devfs_remove("i2c/%d", i);
dev_dbg(&adap->dev, "Adapter unregistered\n");
return 0;
}
-int i2cdev_detach_client(struct i2c_client *client)
+static int i2cdev_detach_client(struct i2c_client *client)
{
return 0;
}
@@ -403,7 +472,27 @@
return -1;
}
-int __init i2c_dev_init(void)
+static struct i2c_driver i2cdev_driver = {
+ .owner = THIS_MODULE,
+ .name = "dev driver",
+ .id = I2C_DRIVERID_I2CDEV,
+ .flags = I2C_DF_NOTIFY,
+ .attach_adapter = i2cdev_attach_adapter,
+ .detach_adapter = i2cdev_detach_adapter,
+ .detach_client = i2cdev_detach_client,
+ .command = i2cdev_command,
+};
+
+static struct i2c_client i2cdev_client_template = {
+ .dev = {
+ .name = "I2C /dev entry",
+ },
+ .id = 1,
+ .addr = -1,
+ .driver = &i2cdev_driver,
+};
+
+static int __init i2c_dev_init(void)
{
int res;
@@ -416,6 +505,7 @@
return -EIO;
}
devfs_mk_dir("i2c");
+ class_register(&i2c_dev_class);
if ((res = i2c_add_driver(&i2cdev_driver))) {
printk(KERN_ERR "i2c-dev.o: Driver registration failed, module not inserted.\n");
devfs_remove("i2c");
@@ -428,11 +518,13 @@
static void __exit i2c_dev_exit(void)
{
i2c_del_driver(&i2cdev_driver);
+ class_unregister(&i2c_dev_class);
devfs_remove("i2c");
unregister_chrdev(I2C_MAJOR,"i2c");
}
-MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl> and Simon G. Vogl <simon@tk.uni-linz.ac.at>");
+MODULE_AUTHOR("Frodo Looijaard <frodol@dds.nl> and "
+ "Simon G. Vogl <simon@tk.uni-linz.ac.at>");
MODULE_DESCRIPTION("I2C /dev entries driver");
MODULE_LICENSE("GPL");
^ permalink raw reply [flat|nested] 20+ messages in thread
* [BK PATCH] Yet more i2c driver changes for 2.5.69
@ 2005-05-19 6:23 ` Greg KH
0 siblings, 0 replies; 20+ messages in thread
From: Greg KH @ 2005-05-19 6:23 UTC (permalink / raw)
To: torvalds; +Cc: linux-kernel, sensors
Hi,
Here are yet more minor i2c fixups for 2.5.69. They add another i2c bus
driver, and fix some bugs in the existing drivers (i287 and i2c-dev.)
Please pull from: bk://kernel.bkbits.net/gregkh/linux/i2c-2.5
thanks,
greg k-h
drivers/i2c/busses/Kconfig | 25 ++
drivers/i2c/busses/Makefile | 1
drivers/i2c/busses/i2c-piix4.c | 4
drivers/i2c/busses/i2c-sis96x.c | 376 ++++++++++++++++++++++++++++++++++++++++
drivers/i2c/chips/it87.c | 1
drivers/i2c/i2c-dev.c | 228 +++++++++++++++++-------
drivers/pci/quirks.c | 80 ++++++++
include/linux/i2c-id.h | 2
include/linux/pci_ids.h | 3
9 files changed, 648 insertions(+), 72 deletions(-)
-----
<mhoffman:lightlink.com>:
o i2c: Add SiS96x I2C/SMBus driver
<warp:mercury.d2dc.net>:
o I2C: And yet another it87 patch
Greg Kroah-Hartman:
o i2c: fix up i2c-dev driver based on previous core changes
o i2c: piix4 driver: turn common error message to a debug level and rename the sysfs driver name
^ permalink raw reply [flat|nested] 20+ messages in thread
end of thread, other threads:[~2005-05-19 6:23 UTC | newest]
Thread overview: 20+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-03-23 8:07 [BK PATCH] Yet more i2c driver changes for 2.5.65 Greg KH
2005-05-19 6:23 ` Greg KH
2003-03-23 8:14 ` [PATCH] " Greg KH
2005-05-19 6:23 ` Greg KH
2003-03-23 8:14 ` Greg KH
2005-05-19 6:23 ` Greg KH
2003-03-23 8:14 ` Greg KH
2005-05-19 6:23 ` Greg KH
2003-03-23 8:15 ` Greg KH
2005-05-19 6:23 ` Greg KH
-- strict thread matches above, loose matches on Subject: below --
2003-05-19 23:11 [BK PATCH] Yet more i2c driver changes for 2.5.69 Greg KH
2005-05-19 6:23 ` Greg KH
2003-05-19 23:12 ` [PATCH] " Greg KH
2005-05-19 6:23 ` Greg KH
2003-05-19 23:12 ` Greg KH
2005-05-19 6:23 ` Greg KH
2003-05-19 23:12 ` Greg KH
2005-05-19 6:23 ` Greg KH
2003-05-19 23:12 ` Greg KH
2005-05-19 6:23 ` Greg KH
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.