diff options
Diffstat (limited to 'drivers/media/video/wm8775.c')
| -rw-r--r-- | drivers/media/video/wm8775.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/drivers/media/video/wm8775.c b/drivers/media/video/wm8775.c index 527c2591749a..22875f1fa1ab 100644 --- a/drivers/media/video/wm8775.c +++ b/drivers/media/video/wm8775.c | |||
| @@ -40,10 +40,10 @@ MODULE_AUTHOR("Ulf Eklund, Hans Verkuil"); | |||
| 40 | MODULE_LICENSE("GPL"); | 40 | MODULE_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 | ||
| @@ -232,14 +232,16 @@ static int wm8775_detach(struct i2c_client *client) | |||
| 232 | 232 | ||
| 233 | /* i2c implementation */ | 233 | /* i2c implementation */ |
| 234 | static struct i2c_driver i2c_driver = { | 234 | static struct i2c_driver i2c_driver = { |
| 235 | .name = "wm8775", | 235 | .driver = { |
| 236 | .owner = THIS_MODULE, | ||
| 237 | .name = "wm8775", | ||
| 238 | }, | ||
| 236 | 239 | ||
| 237 | .id = I2C_DRIVERID_WM8775, | 240 | .id = I2C_DRIVERID_WM8775, |
| 238 | 241 | ||
| 239 | .attach_adapter = wm8775_probe, | 242 | .attach_adapter = wm8775_probe, |
| 240 | .detach_client = wm8775_detach, | 243 | .detach_client = wm8775_detach, |
| 241 | .command = wm8775_command, | 244 | .command = wm8775_command, |
| 242 | .owner = THIS_MODULE, | ||
| 243 | }; | 245 | }; |
| 244 | 246 | ||
| 245 | 247 | ||
