aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/wm8775.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/wm8775.c')
-rw-r--r--drivers/media/video/wm8775.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c
index a6936ad74fc..bbfd55cd994 100644
--- a/drivers/media/video/wm8775.c
+++ b/drivers/media/video/wm8775.c
@@ -40,10 +40,10 @@ MODULE_AUTHOR("Ulf Eklund, Hans Verkuil");
40MODULE_LICENSE("GPL"); 40MODULE_LICENSE("GPL");
41 41
42#define wm8775_err(fmt, arg...) do { \ 42#define wm8775_err(fmt, arg...) do { \
43 printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->name, \ 43 printk(KERN_ERR "%s %d-%04x: " fmt, client->driver->driver.name, \
44 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0) 44 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
45#define wm8775_info(fmt, arg...) do { \ 45#define wm8775_info(fmt, arg...) do { \
46 printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->name, \ 46 printk(KERN_INFO "%s %d-%04x: " fmt, client->driver->driver.name, \
47 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0) 47 i2c_adapter_id(client->adapter), client->addr , ## arg); } while (0)
48 48
49 49
@@ -168,7 +168,6 @@ static int wm8775_attach(struct i2c_adapter *adapter, int address, int kind)
168 client->addr = address; 168 client->addr = address;
169 client->adapter = adapter; 169 client->adapter = adapter;
170 client->driver = &i2c_driver; 170 client->driver = &i2c_driver;
171 client->flags = I2C_CLIENT_ALLOW_USE;
172 snprintf(client->name, sizeof(client->name) - 1, "wm8775"); 171 snprintf(client->name, sizeof(client->name) - 1, "wm8775");
173 172
174 wm8775_info("chip found @ 0x%x (%s)\n", address << 1, adapter->name); 173 wm8775_info("chip found @ 0x%x (%s)\n", address << 1, adapter->name);
@@ -233,15 +232,15 @@ static int wm8775_detach(struct i2c_client *client)
233 232
234/* i2c implementation */ 233/* i2c implementation */
235static struct i2c_driver i2c_driver = { 234static struct i2c_driver i2c_driver = {
236 .name = "wm8775", 235 .driver = {
236 .name = "wm8775",
237 },
237 238
238 .id = I2C_DRIVERID_WM8775, 239 .id = I2C_DRIVERID_WM8775,
239 .flags = I2C_DF_NOTIFY,
240 240
241 .attach_adapter = wm8775_probe, 241 .attach_adapter = wm8775_probe,
242 .detach_client = wm8775_detach, 242 .detach_client = wm8775_detach,
243 .command = wm8775_command, 243 .command = wm8775_command,
244 .owner = THIS_MODULE,
245}; 244};
246 245
247 246