i2c: Rework client usage count, 3 of 3
Subsystems (5)
PATCH 1/1 i2c: Rework client usage count, 3 of 3
[PATCH] i2c: Rework client usage count, 3 of 3
Do not limit the usage count of i2c clients to 1. In other words, change the client usage count behavior from the old I2C_CLIENT_ALLOW_USE to the old I2C_CLIENT_ALLOW_MULTIPLE_USE. The rationale is that no driver actually needs the limiting behavior, and the unlimiting behavior is slightly easier to implement.
Update the documentation to reflect this change.
---
commit cf02df770228350254251fde520007a2709db785
tree ef10929d0160ebf27f29bac2a9e285b267a63331
parent cde7859bda0d1124392b44e50aa11df99707e1d9
author Jean Delvare <khali at linux-fr.org> Sat, 26 Nov 2005 21:03:41 +0100 committer Greg Kroah-Hartman <gregkh at suse.de> Thu, 05 Jan 2006 22:16:22 -0800
Documentation/i2c/porting-clients | 1 + drivers/i2c/i2c-core.c | 5 ----- include/linux/i2c.h | 4 +--- 3 files changed, 2 insertions(+), 8 deletions(-)
Documentation/i2c/porting-clients +1 -0
@@ -92,6 +92,7 @@ Technical changes: Drop client->id. Drop any 24RF08 corruption prevention you find, as this is now done at the i2c-core level, and doing it twice voids it. + Don't add I2C_CLIENT_ALLOW_USE to client->flags, it's the default now. * [Init] Limits must not be set by the driver (can be done later in user-space). Chip should not be reset default (although a module
drivers/i2c/i2c-core.c +0 -5
@@ -497,14 +497,9 @@ int i2c_use_client(struct i2c_client *clif (ret)return ret; -if (client->usage_count >0 ) - goto busy; client->usage_count++;return 0 ; - busy: -i2c_dec_use_client (client); -return -EBUSY ; }int i2c_release_client (struct i2c_client *client)
include/linux/i2c.h +1 -3
@@ -307,9 +307,7 @@ extern struct i2c_client *i2c_get_clientextern struct i2c_client *i2c_get_client(int,int,struct i2c_client *); to make sure that client-struct is valid and that it is okay to access the i2c-client. -returns -EACCES if client doesn't allow use (default) -returns -EBUSY if client doesn't allow multiple use (default) and -usage_count >0 */ +returns -ENODEV if client has gone in the meantime */ extern int i2c_use_client (struct i2c_client *);extern int i2c_release_client (struct i2c_client *);
PATCH 1/1 i2c: Rework client usage count, 1 of 3
[PATCH] i2c: Rework client usage count, 1 of 3
No i2c client uses the I2C_CLIENT_ALLOW_MULTIPLE_USE flag, drop it.
---
commit cb748fb20186d4b345c68a7f580429f379fdd268
tree 6c8f4f0937941bb4ee56ed72ba0b7f60562f1e1d
parent 5d7b851dcced3611e4a4432308618b1ed1a9fc31
author Jean Delvare <khali at linux-fr.org> Sat, 26 Nov 2005 20:58:35 +0100 committer Greg Kroah-Hartman <gregkh at suse.de> Thu, 05 Jan 2006 22:16:22 -0800
drivers/i2c/i2c-core.c | 4 +--- include/linux/i2c.h | 2 -- 2 files changed, 1 insertions(+), 5 deletions(-)
drivers/i2c/i2c-core.c +1 -3
@@ -500,9 +500,7 @@ int i2c_use_client(struct i2c_client *clreturn ret;if (client->flags &I2C_CLIENT_ALLOW_USE ) { -if (client->flags &I2C_CLIENT_ALLOW_MULTIPLE_USE ) - client->usage_count++; -else if (client->usage_count >0 ) +if (client->usage_count >0 ) goto busy;else client->usage_count++;
include/linux/i2c.h +0 -2
@@ -251,8 +251,6 @@ static inline void i2c_set_adapdata (str/*flags for the client struct: */ #define I2C_CLIENT_ALLOW_USE 0x01/* Client allows access */ -#define I2C_CLIENT_ALLOW_MULTIPLE_USE 0x02/* Allow multiple access-locks */ -/* on an i2c_client */ #define I2C_CLIENT_PEC 0x04/* Use Packet Error Checking */ #define I2C_CLIENT_TEN 0x10/* we have a ten bit chip address */ /* Must equal I2C_M_TEN below */
PATCH 1/1 i2c: Rework client usage count, 2 of 3
In reply to Greg KH[PATCH] i2c: Rework client usage count, 2 of 3
Make I2C_CLIENT_ALLOW_USE the default for all i2c clients. It doesn't hurt if the usage count is actually never used for any given driver, and allows for nice code simplifications in i2c-core.
---
commit cde7859bda0d1124392b44e50aa11df99707e1d9
tree c852e7ff9b44b5e59f6ae75951514585f0ff10d9
parent cb748fb20186d4b345c68a7f580429f379fdd268
author Jean Delvare <khali at linux-fr.org> Sat, 26 Nov 2005 21:00:54 +0100 committer Greg Kroah-Hartman <gregkh at suse.de> Thu, 05 Jan 2006 22:16:22 -0800
arch/arm/mach-pxa/akita-ioexp.c | 1 - drivers/i2c/chips/rtc8564.c | 1 - drivers/i2c/i2c-core.c | 28 ++++++++++------------------ drivers/media/video/adv7170.c | 1 - drivers/media/video/adv7175.c | 1 - drivers/media/video/bt819.c | 1 - drivers/media/video/bt832.c | 1 - drivers/media/video/bt856.c | 1 - drivers/media/video/cs53l32a.c | 1 - drivers/media/video/cx25840/cx25840-core.c | 1 - drivers/media/video/em28xx/em28xx-i2c.c | 1 - drivers/media/video/msp3400.c | 1 - drivers/media/video/saa6588.c | 1 - drivers/media/video/saa7110.c | 1 - drivers/media/video/saa7111.c | 1 - drivers/media/video/saa7114.c | 1 - drivers/media/video/saa7115.c | 1 - drivers/media/video/saa711x.c | 1 - drivers/media/video/saa7127.c | 1 - drivers/media/video/saa7134/saa6752hs.c | 1 - drivers/media/video/saa7185.c | 1 - drivers/media/video/tda9887.c | 1 - drivers/media/video/tuner-core.c | 1 - drivers/media/video/tvaudio.c | 1 - drivers/media/video/tveeprom.c | 1 - drivers/media/video/tvp5150.c | 1 - drivers/media/video/vpx3220.c | 1 - drivers/media/video/wm8775.c | 1 - include/linux/i2c.h | 1 - 29 files changed, 10 insertions(+), 46 deletions(-)
arch/arm/mach-pxa/akita-ioexp.c +0 -1
@@ -133,7 +133,6 @@ static struct i2c_driver max7310_i2c_dristatic struct i2c_client max7310_template = { name:"akita-max7310" , - flags:I2C_CLIENT_ALLOW_USE , driver: &max7310_i2c_driver, };
drivers/i2c/chips/rtc8564.c +0 -1
@@ -155,7 +155,6 @@ static int rtc8564_attach(struct i2c_adastrlcpy (new_client->name,"RTC8564" ,I2C_NAME_SIZE );i2c_set_clientdata (new_client, d); - new_client->flags =I2C_CLIENT_ALLOW_USE ; new_client->addr = addr; new_client->adapter = adap; new_client->driver = &rtc8564_driver;
drivers/i2c/i2c-core.c +10 -18
@@ -419,8 +419,7 @@ int i2c_attach_client(struct i2c_client } } -if (client->flags &I2C_CLIENT_ALLOW_USE ) - client->usage_count =0 ; + client->usage_count =0 ; client->dev.parent = &client->adapter->dev; client->dev.driver = &client->driver->driver;
@@ -443,8 +442,7 @@ int i2c_detach_client(struct i2c_clientstruct i2c_adapter *adapter = client->adapter;int res =0 ; -if ((client->flags &I2C_CLIENT_ALLOW_USE ) - && (client->usage_count >0 )) { +if (client->usage_count >0 ) {dev_warn (&client->dev,"Client [%s] still busy, " "can't detach\n" , client->name);return -EBUSY ;
@@ -499,12 +497,9 @@ int i2c_use_client(struct i2c_client *clif (ret)return ret; -if (client->flags &I2C_CLIENT_ALLOW_USE ) { -if (client->usage_count >0 ) - goto busy; -else - client->usage_count++; - } +if (client->usage_count >0 ) + goto busy; + client->usage_count++;return 0 ; busy:
@@ -514,16 +509,13 @@ int i2c_use_client(struct i2c_client *clint i2c_release_client (struct i2c_client *client) { -if (client->flags &I2C_CLIENT_ALLOW_USE ) { -if (client->usage_count>0 ) - client->usage_count--; -else { -pr_debug ("i2c-core: %s used one too many times\n" , - __FUNCTION__); -return -EPERM ; - } +if (!client->usage_count) { +pr_debug ("i2c-core: %s used one too many times\n" , + __FUNCTION__); +return -EPERM ; } + client->usage_count--;i2c_dec_use_client (client);return 0 ;
drivers/media/video/adv7170.c +0 -1
@@ -420,7 +420,6 @@ adv7170_detect_client (struct i2c_adapte client->addr = address; client->adapter = adapter; client->driver = &i2c_driver_adv7170; - client->flags =I2C_CLIENT_ALLOW_USE ;if ((client->addr =I2C_ADV7170 >>1 ) || (client->addr = (I2C_ADV7170 >>1 ) +1 )) { dname = adv7170_name;
drivers/media/video/adv7175.c +0 -1
@@ -470,7 +470,6 @@ adv7175_detect_client (struct i2c_adapte client->addr = address; client->adapter = adapter; client->driver = &i2c_driver_adv7175; - client->flags =I2C_CLIENT_ALLOW_USE ;if ((client->addr =I2C_ADV7175 >>1 ) || (client->addr = (I2C_ADV7175 >>1 ) +1 )) { dname = adv7175_name;
drivers/media/video/bt819.c +0 -1
@@ -535,7 +535,6 @@ bt819_detect_client (struct i2c_adapter client->addr = address; client->adapter = adapter; client->driver = &i2c_driver_bt819; - client->flags =I2C_CLIENT_ALLOW_USE ; decoder =kmalloc (sizeof (struct bt819 ),GFP_KERNEL );if (decoder =NULL ) {
drivers/media/video/bt832.c +0 -1
@@ -240,7 +240,6 @@ static struct i2c_driver driver = {static struct i2c_client client_template { .name = "bt832", - .flags = I2C_CLIENT_ALLOW_USE, .driver = &driver, };
drivers/media/video/bt856.c +0 -1
@@ -323,7 +323,6 @@ bt856_detect_client (struct i2c_adapter client->addr = address; client->adapter = adapter; client->driver = &i2c_driver_bt856; - client->flags =I2C_CLIENT_ALLOW_USE ;strlcpy (I2C_NAME (client),"bt856" ,sizeof (I2C_NAME (client))); encoder =kmalloc (sizeof (struct bt856 ),GFP_KERNEL );
drivers/media/video/cs53l32a.c +0 -1
@@ -154,7 +154,6 @@ static int cs53l32a_attach(struct i2c_ad client->addr = address; client->adapter = adapter; client->driver = &i2c_driver; - client->flags =I2C_CLIENT_ALLOW_USE ;snprintf (client->name,sizeof (client->name) -1 ,"cs53l32a" );cs53l32a_info ("chip found @ 0x%x (%s)\n" , address <<1 , adapter->name);
drivers/media/video/cx25840/cx25840-core.c +0 -1
@@ -773,7 +773,6 @@ static int cx25840_detect_client(struct client->addr = address; client->adapter = adapter; client->driver = &i2c_driver_cx25840; - client->flags =I2C_CLIENT_ALLOW_USE ;snprintf (client->name,sizeof (client->name) -1 ,"cx25840" );cx25840_dbg ("detecting cx25840 client on address 0x%x\n" , address <<1 );
drivers/media/video/em28xx/em28xx-i2c.c +0 -1
@@ -497,7 +497,6 @@ static struct i2c_adapter em28xx_adap_testatic struct i2c_client em28xx_client_template = { .name ="em28xx internal" , - .flags =I2C_CLIENT_ALLOW_USE , };/* ----------------------------------------------------------- */
drivers/media/video/msp3400.c +0 -1
@@ -1576,7 +1576,6 @@ static struct i2c_driver driver = {static struct i2c_client client_template { .name = "(unset)", - .flags = I2C_CLIENT_ALLOW_USE, .driver = &driver, };
drivers/media/video/saa6588.c +0 -1
@@ -505,7 +505,6 @@ static struct i2c_driver driver = {static struct i2c_client client_template = { .name ="saa6588" , - .flags =I2C_CLIENT_ALLOW_USE , .driver = &driver, };
drivers/media/video/saa7110.c +0 -1
@@ -501,7 +501,6 @@ saa7110_detect_client (struct i2c_adapte client->addr = address; client->adapter = adapter; client->driver = &i2c_driver_saa7110; - client->flags =I2C_CLIENT_ALLOW_USE ;strlcpy (I2C_NAME (client),"saa7110" ,sizeof (I2C_NAME (client))); decoder =kmalloc (sizeof (struct saa7110 ),GFP_KERNEL );
drivers/media/video/saa7111.c +0 -1
@@ -518,7 +518,6 @@ saa7111_detect_client (struct i2c_adapte client->addr = address; client->adapter = adapter; client->driver = &i2c_driver_saa7111; - client->flags =I2C_CLIENT_ALLOW_USE ;strlcpy (I2C_NAME (client),"saa7111" ,sizeof (I2C_NAME (client))); decoder =kmalloc (sizeof (struct saa7111 ),GFP_KERNEL );
drivers/media/video/saa7114.c +0 -1
@@ -859,7 +859,6 @@ saa7114_detect_client (struct i2c_adapte client->addr = address; client->adapter = adapter; client->driver = &i2c_driver_saa7114; - client->flags =I2C_CLIENT_ALLOW_USE ;strlcpy (I2C_NAME (client),"saa7114" ,sizeof (I2C_NAME (client))); decoder =kmalloc (sizeof (struct saa7114 ),GFP_KERNEL );
drivers/media/video/saa7115.c +0 -1
@@ -1270,7 +1270,6 @@ static int saa7115_attach(struct i2c_ada client->addr = address; client->adapter = adapter; client->driver = &i2c_driver_saa7115; - client->flags =I2C_CLIENT_ALLOW_USE ;snprintf (client->name,sizeof (client->name) -1 ,"saa7115" );saa7115_dbg ("detecting saa7115 client on address 0x%x\n" , address <<1 );
drivers/media/video/saa711x.c +0 -1
@@ -494,7 +494,6 @@ saa711x_detect_client (struct i2c_adapte client->addr = address; client->adapter = adapter; client->driver = &i2c_driver_saa711x; - client->flags =I2C_CLIENT_ALLOW_USE ;strlcpy (I2C_NAME (client),"saa711x" ,sizeof (I2C_NAME (client))); decoder =kmalloc (sizeof (struct saa711x ),GFP_KERNEL );if (decoder =NULL ) {
drivers/media/video/saa7127.c +0 -1
@@ -719,7 +719,6 @@ static int saa7127_attach(struct i2c_ada client->addr = address; client->adapter = adapter; client->driver = &i2c_driver_saa7127; - client->flags =I2C_CLIENT_ALLOW_USE ;snprintf (client->name,sizeof (client->name) -1 ,"saa7127" );saa7127_dbg ("detecting saa7127 client on address 0x%x\n" , address <<1 );
drivers/media/video/saa7134/saa6752hs.c +0 -1
@@ -608,7 +608,6 @@ static struct i2c_driver driver = {static struct i2c_client client_template { .name = "saa6752hs", - .flags = I2C_CLIENT_ALLOW_USE, .driver = &driver, };
drivers/media/video/saa7185.c +0 -1
@@ -415,7 +415,6 @@ saa7185_detect_client (struct i2c_adapte client->addr = address; client->adapter = adapter; client->driver = &i2c_driver_saa7185; - client->flags =I2C_CLIENT_ALLOW_USE ;strlcpy (I2C_NAME (client),"saa7185" ,sizeof (I2C_NAME (client))); encoder =kmalloc (sizeof (struct saa7185 ),GFP_KERNEL );
drivers/media/video/tda9887.c +0 -1
@@ -833,7 +833,6 @@ static struct i2c_driver driver = {static struct i2c_client client_template { .name = "tda9887", - .flags = I2C_CLIENT_ALLOW_USE, .driver = &driver, };
drivers/media/video/tuner-core.c +0 -1
@@ -755,7 +755,6 @@ static struct i2c_driver driver = { };static struct i2c_client client_template = { .name ="(tuner unset)" , - .flags =I2C_CLIENT_ALLOW_USE , .driver = &driver, };
drivers/media/video/tvaudio.c +0 -1
@@ -1713,7 +1713,6 @@ static struct i2c_driver driver = {static struct i2c_client client_template { .name = "(unset)", - .flags = I2C_CLIENT_ALLOW_USE, .driver = &driver, };
drivers/media/video/tveeprom.c +0 -1
@@ -751,7 +751,6 @@ tveeprom_detect_client(struct i2c_adapte client->addr = address; client->adapter = adapter; client->driver = &i2c_driver_tveeprom; - client->flags =I2C_CLIENT_ALLOW_USE ;snprintf (client->name,sizeof (client->name),"tveeprom" );i2c_attach_client (client);
drivers/media/video/tvp5150.c +0 -1
@@ -714,7 +714,6 @@ static struct i2c_driver driver;static struct i2c_client client_template = { .name ="(unset)" , - .flags =I2C_CLIENT_ALLOW_USE , .driver = &driver, };
drivers/media/video/vpx3220.c +0 -1
@@ -631,7 +631,6 @@ vpx3220_detect_client (struct i2c_adapte client->addr = address; client->adapter = adapter; client->driver = &vpx3220_i2c_driver; - client->flags =I2C_CLIENT_ALLOW_USE ;/* Check for manufacture ID and part number */ if (kind <0 ) {
drivers/media/video/wm8775.c +0 -1
@@ -168,7 +168,6 @@ static int wm8775_attach(struct i2c_adap client->addr = address; client->adapter = adapter; client->driver = &i2c_driver; - client->flags =I2C_CLIENT_ALLOW_USE ;snprintf (client->name,sizeof (client->name) -1 ,"wm8775" );wm8775_info ("chip found @ 0x%x (%s)\n" , address <<1 , adapter->name);
include/linux/i2c.h +0 -1
@@ -250,7 +250,6 @@ static inline void i2c_set_adapdata (str }/*flags for the client struct: */ -#define I2C_CLIENT_ALLOW_USE 0x01/* Client allows access */ #define I2C_CLIENT_PEC 0x04/* Use Packet Error Checking */ #define I2C_CLIENT_TEN 0x10/* we have a ten bit chip address */ /* Must equal I2C_M_TEN below */