Commit 0c418844 authored by Paul Bolle's avatar Paul Bolle Committed by Samuel Ortiz

mfd: lpc_ich: One uninitialized cell is no error

At every boot of an (outdated) laptop lpc_ich prints an error:
    lpc_ich 0000:00:1f.0: I/O space for GPIO uninitialized

But if one looks at lpc_ich's probe function one notices that the code
only cares if both lpc_ich_init_wdt() and lpc_ich_init_gpio() fail to
add any cells. So stop treating the failure to add a single cell as an
error. Those messages can be printed at notice level. And then only warn
if no cells were added.
Signed-off-by: default avatarPaul Bolle <pebolle@tiscali.nl>
Signed-off-by: default avatarSamuel Ortiz <sameo@linux.intel.com>
parent e294bc91
...@@ -734,7 +734,7 @@ static int __devinit lpc_ich_init_gpio(struct pci_dev *dev, ...@@ -734,7 +734,7 @@ static int __devinit lpc_ich_init_gpio(struct pci_dev *dev,
pci_read_config_dword(dev, ACPIBASE, &base_addr_cfg); pci_read_config_dword(dev, ACPIBASE, &base_addr_cfg);
base_addr = base_addr_cfg & 0x0000ff80; base_addr = base_addr_cfg & 0x0000ff80;
if (!base_addr) { if (!base_addr) {
dev_err(&dev->dev, "I/O space for ACPI uninitialized\n"); dev_notice(&dev->dev, "I/O space for ACPI uninitialized\n");
lpc_ich_cells[LPC_GPIO].num_resources--; lpc_ich_cells[LPC_GPIO].num_resources--;
goto gpe0_done; goto gpe0_done;
} }
...@@ -760,7 +760,7 @@ static int __devinit lpc_ich_init_gpio(struct pci_dev *dev, ...@@ -760,7 +760,7 @@ static int __devinit lpc_ich_init_gpio(struct pci_dev *dev,
pci_read_config_dword(dev, GPIOBASE, &base_addr_cfg); pci_read_config_dword(dev, GPIOBASE, &base_addr_cfg);
base_addr = base_addr_cfg & 0x0000ff80; base_addr = base_addr_cfg & 0x0000ff80;
if (!base_addr) { if (!base_addr) {
dev_err(&dev->dev, "I/O space for GPIO uninitialized\n"); dev_notice(&dev->dev, "I/O space for GPIO uninitialized\n");
ret = -ENODEV; ret = -ENODEV;
goto gpio_done; goto gpio_done;
} }
...@@ -810,7 +810,7 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev, ...@@ -810,7 +810,7 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev,
pci_read_config_dword(dev, ACPIBASE, &base_addr_cfg); pci_read_config_dword(dev, ACPIBASE, &base_addr_cfg);
base_addr = base_addr_cfg & 0x0000ff80; base_addr = base_addr_cfg & 0x0000ff80;
if (!base_addr) { if (!base_addr) {
dev_err(&dev->dev, "I/O space for ACPI uninitialized\n"); dev_notice(&dev->dev, "I/O space for ACPI uninitialized\n");
ret = -ENODEV; ret = -ENODEV;
goto wdt_done; goto wdt_done;
} }
...@@ -837,8 +837,8 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev, ...@@ -837,8 +837,8 @@ static int __devinit lpc_ich_init_wdt(struct pci_dev *dev,
pci_read_config_dword(dev, RCBABASE, &base_addr_cfg); pci_read_config_dword(dev, RCBABASE, &base_addr_cfg);
base_addr = base_addr_cfg & 0xffffc000; base_addr = base_addr_cfg & 0xffffc000;
if (!(base_addr_cfg & 1)) { if (!(base_addr_cfg & 1)) {
pr_err("RCBA is disabled by hardware/BIOS, " dev_notice(&dev->dev, "RCBA is disabled by "
"device disabled\n"); "hardware/BIOS, device disabled\n");
ret = -ENODEV; ret = -ENODEV;
goto wdt_done; goto wdt_done;
} }
...@@ -874,6 +874,7 @@ static int __devinit lpc_ich_probe(struct pci_dev *dev, ...@@ -874,6 +874,7 @@ static int __devinit lpc_ich_probe(struct pci_dev *dev,
* successfully. * successfully.
*/ */
if (!cell_added) { if (!cell_added) {
dev_warn(&dev->dev, "No MFD cells added\n");
lpc_ich_restore_config_space(dev); lpc_ich_restore_config_space(dev);
return -ENODEV; return -ENODEV;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment