diff options
Diffstat (limited to 'drivers/mfd/wm8994-core.c')
-rw-r--r-- | drivers/mfd/wm8994-core.c | 25 |
1 files changed, 5 insertions, 20 deletions
diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c index 9d7ca1e978f..1e321d34977 100644 --- a/drivers/mfd/wm8994-core.c +++ b/drivers/mfd/wm8994-core.c | |||
@@ -500,7 +500,8 @@ static __devinit int wm8994_device_init(struct wm8994 *wm8994, int irq) | |||
500 | ret); | 500 | ret); |
501 | goto err_enable; | 501 | goto err_enable; |
502 | } | 502 | } |
503 | wm8994->revision = ret; | 503 | wm8994->revision = ret & WM8994_CHIP_REV_MASK; |
504 | wm8994->cust_id = (ret & WM8994_CUST_ID_MASK) >> WM8994_CUST_ID_SHIFT; | ||
504 | 505 | ||
505 | switch (wm8994->type) { | 506 | switch (wm8994->type) { |
506 | case WM8994: | 507 | case WM8994: |
@@ -553,8 +554,8 @@ static __devinit int wm8994_device_init(struct wm8994 *wm8994, int irq) | |||
553 | break; | 554 | break; |
554 | } | 555 | } |
555 | 556 | ||
556 | dev_info(wm8994->dev, "%s revision %c\n", devname, | 557 | dev_info(wm8994->dev, "%s revision %c CUST_ID %02x\n", devname, |
557 | 'A' + wm8994->revision); | 558 | 'A' + wm8994->revision, wm8994->cust_id); |
558 | 559 | ||
559 | switch (wm8994->type) { | 560 | switch (wm8994->type) { |
560 | case WM1811: | 561 | case WM1811: |
@@ -732,23 +733,7 @@ static struct i2c_driver wm8994_i2c_driver = { | |||
732 | .id_table = wm8994_i2c_id, | 733 | .id_table = wm8994_i2c_id, |
733 | }; | 734 | }; |
734 | 735 | ||
735 | static int __init wm8994_i2c_init(void) | 736 | module_i2c_driver(wm8994_i2c_driver); |
736 | { | ||
737 | int ret; | ||
738 | |||
739 | ret = i2c_add_driver(&wm8994_i2c_driver); | ||
740 | if (ret != 0) | ||
741 | pr_err("Failed to register wm8994 I2C driver: %d\n", ret); | ||
742 | |||
743 | return ret; | ||
744 | } | ||
745 | module_init(wm8994_i2c_init); | ||
746 | |||
747 | static void __exit wm8994_i2c_exit(void) | ||
748 | { | ||
749 | i2c_del_driver(&wm8994_i2c_driver); | ||
750 | } | ||
751 | module_exit(wm8994_i2c_exit); | ||
752 | 737 | ||
753 | MODULE_DESCRIPTION("Core support for the WM8994 audio CODEC"); | 738 | MODULE_DESCRIPTION("Core support for the WM8994 audio CODEC"); |
754 | MODULE_LICENSE("GPL"); | 739 | MODULE_LICENSE("GPL"); |