i2c-nforce2: Remove redundant error messages on ACPI conflict

The ACPI subsystem strictly checks for resource conflicts. When there's
a conflict, it outputs a warning message with all the details needed to
properly diagnose the underlying issue. However, the i2c-nforce2 driver
also prints its own message. Not only is the message redundant, it is at
the KERN_ERR level, which overrides some bootsplash screens for no good
reason. This change removes the two lines that print out the error
messages.

Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/i2c/busses/i2c-nforce2.c b/drivers/i2c/busses/i2c-nforce2.c
index b23dfe9f2787..a605a5029cfe 100644
--- a/drivers/i2c/busses/i2c-nforce2.c
+++ b/drivers/i2c/busses/i2c-nforce2.c
@@ -404,10 +404,9 @@ static int __devinit nforce2_probe(struct pci_dev *dev, const struct pci_device_
 
         /* SMBus adapter 1 */
         res1 = nforce2_probe_smb(dev, 4, NFORCE_PCI_SMB1, &smbuses[0], "SMB1");
-        if (res1 < 0) {
-                dev_err(&dev->dev, "Error probing SMB1.\n");
+        if (res1 < 0)
                 smbuses[0].base = 0;    /* to have a check value */
-        }
+
         /* SMBus adapter 2 */
         if (dmi_check_system(nforce2_dmi_blacklist2)) {
                 dev_err(&dev->dev, "Disabling SMB2 for safety reasons.\n");
@@ -416,11 +415,10 @@ static int __devinit nforce2_probe(struct pci_dev *dev, const struct pci_device_
         } else {
                 res2 = nforce2_probe_smb(dev, 5, NFORCE_PCI_SMB2, &smbuses[1],
                                          "SMB2");
-                if (res2 < 0) {
-                        dev_err(&dev->dev, "Error probing SMB2.\n");
+                if (res2 < 0)
                         smbuses[1].base = 0;    /* to have a check value */
-                }
         }
+
         if ((res1 < 0) && (res2 < 0)) {
                 /* we did not find even one of the SMBuses, so we give up */
                 kfree(smbuses);