Changeset 4332

Show
Ignore:
Timestamp:
02/23/07 15:48:54 (2 years ago)
Author:
khali
Message:

smsc47m1: Get rid of a useless semaphore (backport from Linux 2.6).

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • lm-sensors/trunk/CHANGES

    r4331 r4332  
    1717  Module i2c-viapro: Add CX700 support (2.6 backport) 
    1818  Module smsc47m1: Add SMSC LPC47M292 support 
     19                   Get rid of a useless semaphore (2.6 backport) 
    1920  Programs i2cdetect, i2cdump, isadump: Flush output in real time 
    2021  Program sensors: Add smsc47m2 support (fans) 

  • lm-sensors/trunk/kernel/chips/smsc47m1.c

    r4331 r4332  
    139139struct smsc47m1_data { 
    140140        struct i2c_client client; 
    141         struct semaphore lock; 
    142141        int sysctl_id; 
    143142        enum chips type; 
    …… 
    159158                          unsigned short flags, int kind); 
    160159static int smsc47m1_detach_client(struct i2c_client *client); 
    161  
    162 static int smsc47m1_read_value(struct i2c_client *client, u8 register); 
    163 static int smsc47m1_write_value(struct i2c_client *client, u8 register, 
    164                                u8 value); 
    165160static void smsc47m1_update_client(struct i2c_client *client); 
    166161static void smsc47m1_init_client(struct i2c_client *client); 
    …… 
    330325        new_client = &data->client; 
    331326        new_client->addr = address; 
    332         init_MUTEX(&data->lock); 
    333327        new_client->data = data; 
    334328        new_client->adapter = adapter; 
    …… 
    386380} 
    387381 
    388 static int smsc47m1_read_value(struct i2c_client *client, u8 reg) 
    389 { 
    390         int res; 
    391  
    392         down(&(((struct smsc47m1_data *) (client->data))->lock)); 
    393         res = inb_p(client->addr + reg); 
    394         up(&(((struct smsc47m1_data *) (client->data))->lock)); 
    395         return res; 
    396 } 
    397  
    398 static int smsc47m1_write_value(struct i2c_client *client, u8 reg, u8 value) 
    399 { 
    400         down(&(((struct smsc47m1_data *) (client->data))->lock)); 
     382static inline int smsc47m1_read_value(struct i2c_client *client, u8 reg) 
     383{ 
     384        return inb_p(client->addr + reg); 
     385} 
     386 
     387static inline void smsc47m1_write_value(struct i2c_client *client, u8 reg, 
     388                u8 value) 
     389{ 
    401390        outb_p(value, client->addr + reg); 
    402         up(&(((struct smsc47m1_data *) (client->data))->lock)); 
    403         return 0; 
    404391} 
    405392