diff options
| -rw-r--r-- | drivers/mfd/lpc_ich.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/mfd/lpc_ich.c b/drivers/mfd/lpc_ich.c index afb2f77a9ae8..b6dd4993c66b 100644 --- a/drivers/mfd/lpc_ich.c +++ b/drivers/mfd/lpc_ich.c | |||
| @@ -734,7 +734,7 @@ static int __devinit lpc_ich_init_gpio(struct pci_dev *dev, | |||
| 734 | pci_read_config_dword(dev, ACPIBASE, &base_addr_cfg); | 734 | pci_read_config_dword(dev, ACPIBASE, &base_addr_cfg); |
| 735 | base_addr = base_addr_cfg & 0x0000ff80; | 735 | base_addr = base_addr_cfg & 0x0000ff80; |
| 736 | if (!base_addr) { | 736 | if (!base_addr) { |
| 737 | dev_err(&dev->dev, "I/O space for ACPI uninitialized\n"); | 737 | dev_notice(&dev->dev, "I/O space for ACPI uninitialized\n"); |
| 738 | lpc_ich_cells[LPC_GPIO].num_resources--; | 738 | lpc_ich_cells[LPC_GPIO].num_resources--; |
| 739 | goto gpe0_done; | 739 | goto gpe0_done; |
| 740 | } | 740 | } |
| @@ -760,7 +760,7 @@ gpe0_done: | |||
| 760 | pci_read_config_dword(dev, GPIOBASE, &base_addr_cfg); | 760 | pci_read_config_dword(dev, GPIOBASE, &base_addr_cfg); |
| 761 | base_addr = base_addr_cfg & 0x0000ff80; | 761 | base_addr = base_addr_cfg & 0x0000ff80; |
| 762 | if (!base_addr) { | 762 | if (!base_addr) { |
| 763 | dev_err(&dev->dev, "I/O space for GPIO uninitialized\n"); | 763 | dev_notice(&dev->dev, "I/O space for GPIO uninitialized\n"); |
| 764 | ret = -ENODEV; | 764 | ret = -ENODEV; |
| 765 | goto gpio_done; | 765 | goto gpio_done; |
| 766 | } | 766 | } |
| @@ -810,7 +810,7 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev, | |||
| 810 | pci_read_config_dword(dev, ACPIBASE, &base_addr_cfg); | 810 | pci_read_config_dword(dev, ACPIBASE, &base_addr_cfg); |
| 811 | base_addr = base_addr_cfg & 0x0000ff80; | 811 | base_addr = base_addr_cfg & 0x0000ff80; |
| 812 | if (!base_addr) { | 812 | if (!base_addr) { |
| 813 | dev_err(&dev->dev, "I/O space for ACPI uninitialized\n"); | 813 | dev_notice(&dev->dev, "I/O space for ACPI uninitialized\n"); |
| 814 | ret = -ENODEV; | 814 | ret = -ENODEV; |
| 815 | goto wdt_done; | 815 | goto wdt_done; |
| 816 | } | 816 | } |
| @@ -837,8 +837,8 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev, | |||
| 837 | pci_read_config_dword(dev, RCBABASE, &base_addr_cfg); | 837 | pci_read_config_dword(dev, RCBABASE, &base_addr_cfg); |
| 838 | base_addr = base_addr_cfg & 0xffffc000; | 838 | base_addr = base_addr_cfg & 0xffffc000; |
| 839 | if (!(base_addr_cfg & 1)) { | 839 | if (!(base_addr_cfg & 1)) { |
| 840 | pr_err("RCBA is disabled by hardware/BIOS, " | 840 | dev_notice(&dev->dev, "RCBA is disabled by " |
| 841 | "device disabled\n"); | 841 | "hardware/BIOS, device disabled\n"); |
| 842 | ret = -ENODEV; | 842 | ret = -ENODEV; |
| 843 | goto wdt_done; | 843 | goto wdt_done; |
| 844 | } | 844 | } |
| @@ -874,6 +874,7 @@ static int __devinit lpc_ich_probe(struct pci_dev *dev, | |||
| 874 | * successfully. | 874 | * successfully. |
| 875 | */ | 875 | */ |
| 876 | if (!cell_added) { | 876 | if (!cell_added) { |
| 877 | dev_warn(&dev->dev, "No MFD cells added\n"); | ||
| 877 | lpc_ich_restore_config_space(dev); | 878 | lpc_ich_restore_config_space(dev); |
| 878 | return -ENODEV; | 879 | return -ENODEV; |
| 879 | } | 880 | } |
