i2c: Check for ACPI resource conflicts

Check for ACPI resource conflicts in i2c bus drivers. I've included
all recent SMBus master drivers for PC hardware.

I've voluntarily left out:
* Drivers that don't run on PCs: they can't conflict with ACPI.
* Bit-banged bus device drivers: it's very unlikely that ACPI would
  deal with such buses.

Signed-off-by: Jean Delvare <jdelvare@suse.de>

1 files changed, 5 insertions, 0 deletions

diff --git a/drivers/i2c/busses/i2c-sis96x.c b/drivers/i2c/busses/i2c-sis96x.c
index 413e9e477723..848b37c97f7f 100644
--- a/drivers/i2c/busses/i2c-sis96x.c
+++ b/drivers/i2c/busses/i2c-sis96x.c
@@ -40,6 +40,7 @@
 #include <linux/ioport.h>
 #include <linux/i2c.h>
 #include <linux/init.h>
+#include <linux/acpi.h>
 #include <asm/io.h>
 
 /* base address register in PCI config space */
@@ -281,6 +282,10 @@ static int __devinit sis96x_probe(struct pci_dev *dev,
         dev_info(&dev->dev, "SiS96x SMBus base address: 0x%04x\n",
                         sis96x_smbus_base);
 
+        retval = acpi_check_resource_conflict(&dev->resource[SIS96x_BAR]);
+        if (retval)
+                return retval;
+
         /* Everything is happy, let's grab the memory and set things up. */
         if (!request_region(sis96x_smbus_base, SMB_IOSIZE,
                             sis96x_driver.name)) {