aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/lpc_ich.c
diff options
context:
space:
mode:
authorBill Pemberton <wfp5p@virginia.edu>2012-11-19 13:23:04 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-28 15:20:19 -0500
commitf791be492f76dea7b0641ed227a60eeb2fa7e255 (patch)
tree1b5348c9b5b47e0927d66cba269a441ac653e564 /drivers/mfd/lpc_ich.c
parent84449216b01f9c2b4c9b1882f9d6abba07b7b7ca (diff)
mfd: remove use of __devinit
CONFIG_HOTPLUG is going away as an option so __devinit is no longer needed. Signed-off-by: Bill Pemberton <wfp5p@virginia.edu> Cc: Srinidhi Kasagar <srinidhi.kasagar@stericsson.com> Cc: Peter Tyser <ptyser@xes-inc.com> Cc: Daniel Walker <dwalker@fifo99.com> Cc: Bryan Huntsman <bryanh@codeaurora.org> Acked-by: David Brown <davidb@codeaurora.org> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mfd/lpc_ich.c')
-rw-r--r--drivers/mfd/lpc_ich.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c
index a43c73ac25b0..99891752c338 100644
--- a/drivers/mfd/lpc_ich.c
+++ b/drivers/mfd/lpc_ich.c
@@ -672,7 +672,7 @@ static void lpc_ich_restore_config_space(struct pci_dev *dev)
672 } 672 }
673} 673}
674 674
675static void __devinit lpc_ich_enable_acpi_space(struct pci_dev *dev) 675static void lpc_ich_enable_acpi_space(struct pci_dev *dev)
676{ 676{
677 u8 reg_save; 677 u8 reg_save;
678 678
@@ -681,7 +681,7 @@ static void __devinit lpc_ich_enable_acpi_space(struct pci_dev *dev)
681 lpc_ich_acpi_save = reg_save; 681 lpc_ich_acpi_save = reg_save;
682} 682}
683 683
684static void __devinit lpc_ich_enable_gpio_space(struct pci_dev *dev) 684static void lpc_ich_enable_gpio_space(struct pci_dev *dev)
685{ 685{
686 u8 reg_save; 686 u8 reg_save;
687 687
@@ -690,7 +690,7 @@ static void __devinit lpc_ich_enable_gpio_space(struct pci_dev *dev)
690 lpc_ich_gpio_save = reg_save; 690 lpc_ich_gpio_save = reg_save;
691} 691}
692 692
693static void __devinit lpc_ich_finalize_cell(struct mfd_cell *cell, 693static void lpc_ich_finalize_cell(struct mfd_cell *cell,
694 const struct pci_device_id *id) 694 const struct pci_device_id *id)
695{ 695{
696 cell->platform_data = &lpc_chipset_info[id->driver_data]; 696 cell->platform_data = &lpc_chipset_info[id->driver_data];
@@ -702,7 +702,7 @@ static void __devinit lpc_ich_finalize_cell(struct mfd_cell *cell,
702 * GPIO groups and it's enough to have access to one of these to instantiate 702 * GPIO groups and it's enough to have access to one of these to instantiate
703 * the device. 703 * the device.
704 */ 704 */
705static int __devinit lpc_ich_check_conflict_gpio(struct resource *res) 705static int lpc_ich_check_conflict_gpio(struct resource *res)
706{ 706{
707 int ret; 707 int ret;
708 u8 use_gpio = 0; 708 u8 use_gpio = 0;
@@ -721,7 +721,7 @@ static int __devinit lpc_ich_check_conflict_gpio(struct resource *res)
721 return use_gpio ? use_gpio : ret; 721 return use_gpio ? use_gpio : ret;
722} 722}
723 723
724static int __devinit lpc_ich_init_gpio(struct pci_dev *dev, 724static int lpc_ich_init_gpio(struct pci_dev *dev,
725 const struct pci_device_id *id) 725 const struct pci_device_id *id)
726{ 726{
727 u32 base_addr_cfg; 727 u32 base_addr_cfg;
@@ -798,7 +798,7 @@ gpio_done:
798 return ret; 798 return ret;
799} 799}
800 800
801static int __devinit lpc_ich_init_wdt(struct pci_dev *dev, 801static int lpc_ich_init_wdt(struct pci_dev *dev,
802 const struct pci_device_id *id) 802 const struct pci_device_id *id)
803{ 803{
804 u32 base_addr_cfg; 804 u32 base_addr_cfg;
@@ -852,7 +852,7 @@ wdt_done:
852 return ret; 852 return ret;
853} 853}
854 854
855static int __devinit lpc_ich_probe(struct pci_dev *dev, 855static int lpc_ich_probe(struct pci_dev *dev,
856 const struct pci_device_id *id) 856 const struct pci_device_id *id)
857{ 857{
858 int ret; 858 int ret;