diff options
-rw-r--r-- | drivers/mfd/88pm860x-core.c | 6 | ||||
-rw-r--r-- | include/linux/mfd/88pm860x.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/drivers/mfd/88pm860x-core.c b/drivers/mfd/88pm860x-core.c index 405d2d5183cf..2c65a2c57294 100644 --- a/drivers/mfd/88pm860x-core.c +++ b/drivers/mfd/88pm860x-core.c | |||
@@ -566,7 +566,7 @@ out: | |||
566 | return ret; | 566 | return ret; |
567 | } | 567 | } |
568 | 568 | ||
569 | static void __devexit device_irq_exit(struct pm860x_chip *chip) | 569 | static void device_irq_exit(struct pm860x_chip *chip) |
570 | { | 570 | { |
571 | if (chip->core_irq) | 571 | if (chip->core_irq) |
572 | free_irq(chip->core_irq, chip); | 572 | free_irq(chip->core_irq, chip); |
@@ -703,7 +703,7 @@ out: | |||
703 | return; | 703 | return; |
704 | } | 704 | } |
705 | 705 | ||
706 | int pm860x_device_init(struct pm860x_chip *chip, | 706 | int __devinit pm860x_device_init(struct pm860x_chip *chip, |
707 | struct pm860x_platform_data *pdata) | 707 | struct pm860x_platform_data *pdata) |
708 | { | 708 | { |
709 | chip->core_irq = 0; | 709 | chip->core_irq = 0; |
@@ -731,7 +731,7 @@ int pm860x_device_init(struct pm860x_chip *chip, | |||
731 | return 0; | 731 | return 0; |
732 | } | 732 | } |
733 | 733 | ||
734 | void pm860x_device_exit(struct pm860x_chip *chip) | 734 | void __devexit pm860x_device_exit(struct pm860x_chip *chip) |
735 | { | 735 | { |
736 | device_irq_exit(chip); | 736 | device_irq_exit(chip); |
737 | mfd_remove_devices(chip->dev); | 737 | mfd_remove_devices(chip->dev); |
diff --git a/include/linux/mfd/88pm860x.h b/include/linux/mfd/88pm860x.h index e3c4ff8c3e38..bfd23bef7363 100644 --- a/include/linux/mfd/88pm860x.h +++ b/include/linux/mfd/88pm860x.h | |||
@@ -370,7 +370,7 @@ extern int pm860x_set_bits(struct i2c_client *, int, unsigned char, | |||
370 | unsigned char); | 370 | unsigned char); |
371 | 371 | ||
372 | extern int pm860x_device_init(struct pm860x_chip *chip, | 372 | extern int pm860x_device_init(struct pm860x_chip *chip, |
373 | struct pm860x_platform_data *pdata); | 373 | struct pm860x_platform_data *pdata) __devinit ; |
374 | extern void pm860x_device_exit(struct pm860x_chip *chip); | 374 | extern void pm860x_device_exit(struct pm860x_chip *chip) __devexit ; |
375 | 375 | ||
376 | #endif /* __LINUX_MFD_88PM860X_H */ | 376 | #endif /* __LINUX_MFD_88PM860X_H */ |