aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cs53l32a.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/cs53l32a.c')
-rw-r--r--drivers/media/video/cs53l32a.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/media/video/cs53l32a.c b/drivers/media/video/cs53l32a.c
index 780b352ec119..643ead1a87ee 100644
--- a/drivers/media/video/cs53l32a.c
+++ b/drivers/media/video/cs53l32a.c
@@ -42,15 +42,16 @@ MODULE_PARM_DESC(debug, "Debugging messages\n\t\t\t0=Off (default), 1=On");
42#define cs53l32a_dbg(fmt, arg...) \ 42#define cs53l32a_dbg(fmt, arg...) \
43 do { \ 43 do { \
44 if (debug) \ 44 if (debug) \
45 printk(KERN_INFO "%s debug %d-%04x: " fmt, client->driver->name, \ 45 printk(KERN_INFO "%s debug %d-%04x: " fmt, \
46 client->driver->driver.name, \
46 i2c_adapter_id(client->adapter), client->addr , ## arg); \ 47 i2c_adapter_id(client->adapter), client->addr , ## arg); \
47 } while (0) 48 } while (0)
48 49
49#define cs53l32a_err(fmt, arg...) do { \ 50#define cs53l32a_err(fmt, arg...) do { \
50 printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \ 51 printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
51 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0) 52 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
52#define cs53l32a_info(fmt, arg...) do { \ 53#define cs53l32a_info(fmt, arg...) do { \
53 printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \ 54 printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
54 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0) 55 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
55 56
56static unsigned short normal_i2c[] = { 0x22 >> 1, I2C_CLIENT_END }; 57static unsigned short normal_i2c[] = { 0x22 >> 1, I2C_CLIENT_END };
@@ -154,7 +155,6 @@ static int cs53l32a_attach(struct i2c_adapter *adapter, int address, int kind)
154 client->addr = address; 155 client->addr = address;
155 client->adapter = adapter; 156 client->adapter = adapter;
156 client->driver = &i2c_driver; 157 client->driver = &i2c_driver;
157 client->flags = I2C_CLIENT_ALLOW_USE;
158 snprintf(client->name, sizeof(client->name) - 1, "cs53l32a"); 158 snprintf(client->name, sizeof(client->name) - 1, "cs53l32a");
159 159
160 cs53l32a_info("chip found @ 0x%x (%s)\n", address << 1, adapter->name); 160 cs53l32a_info("chip found @ 0x%x (%s)\n", address << 1, adapter->name);
@@ -216,13 +216,13 @@ static int cs53l32a_detach(struct i2c_client *client)
216 216
217/* i2c implementation */ 217/* i2c implementation */
218static struct i2c_driver i2c_driver = { 218static struct i2c_driver i2c_driver = {
219 .name = "cs53l32a", 219 .driver = {
220 .name = "cs53l32a",
221 },
220 .id = I2C_DRIVERID_CS53L32A, 222 .id = I2C_DRIVERID_CS53L32A,
221 .flags = I2C_DF_NOTIFY,
222 .attach_adapter = cs53l32a_probe, 223 .attach_adapter = cs53l32a_probe,
223 .detach_client = cs53l32a_detach, 224 .detach_client = cs53l32a_detach,
224 .command = cs53l32a_command, 225 .command = cs53l32a_command,
225 .owner = THIS_MODULE,
226}; 226};
227 227
228 228