Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54fb4a05 authored by Jean Delvare's avatar Jean Delvare Committed by Jean Delvare
Browse files

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: default avatarJean Delvare <jdelvare@suse.de>
parent 2373c180

drivers/i2c/busses/i2c-ali1535.c

+6 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ 
#include <linux/ioport.h>

#include <linux/i2c.h>

#include <linux/init.h>

#include <linux/acpi.h>

#include <asm/io.h>
@@ -159,6 +160,11 @@ static int ali1535_setup(struct pci_dev *dev) 
		goto exit;

	}



	retval = acpi_check_region(ali1535_smba, ALI1535_SMB_IOSIZE,

				   ali1535_driver.name);

	if (retval)

		goto exit;



	if (!request_region(ali1535_smba, ALI1535_SMB_IOSIZE,

			    ali1535_driver.name)) {

		dev_err(&dev->dev, "ALI1535_smb region 0x%x already in use!\n",

drivers/i2c/busses/i2c-ali1563.c

+5 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/i2c.h>

#include <linux/pci.h>

#include <linux/init.h>

#include <linux/acpi.h>



#define ALI1563_MAX_TIMEOUT	500

#define	ALI1563_SMBBA		0x80
@@ -356,6 +357,10 @@ static int __devinit ali1563_setup(struct pci_dev * dev) 
		}

	}



	if (acpi_check_region(ali1563_smba, ALI1563_SMB_IOSIZE,

			      ali1563_pci_driver.name))

		goto Err;



	if (!request_region(ali1563_smba, ALI1563_SMB_IOSIZE,

			    ali1563_pci_driver.name)) {

		dev_err(&dev->dev, "Could not allocate I/O space at 0x%04x\n",

drivers/i2c/busses/i2c-ali15x3.c

+5 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 
#include <linux/delay.h>

#include <linux/i2c.h>

#include <linux/init.h>

#include <linux/acpi.h>

#include <asm/io.h>



/* ALI15X3 SMBus address offsets */
@@ -166,6 +167,10 @@ static int ali15x3_setup(struct pci_dev *ALI15X3_dev) 
	if(force_addr)

		ali15x3_smba = force_addr & ~(ALI15X3_SMB_IOSIZE - 1);



	if (acpi_check_region(ali15x3_smba, ALI15X3_SMB_IOSIZE,

			      ali15x3_driver.name))

		return -EBUSY;



	if (!request_region(ali15x3_smba, ALI15X3_SMB_IOSIZE,

			    ali15x3_driver.name)) {

		dev_err(&ALI15X3_dev->dev,

drivers/i2c/busses/i2c-amd756.c

+6 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#include <linux/ioport.h>

#include <linux/i2c.h>

#include <linux/init.h>

#include <linux/acpi.h>

#include <asm/io.h>



/* AMD756 SMBus address offsets */
@@ -368,6 +369,11 @@ static int __devinit amd756_probe(struct pci_dev *pdev, 
		amd756_ioport += SMB_ADDR_OFFSET;

	}



	error = acpi_check_region(amd756_ioport, SMB_IOSIZE,

				  amd756_driver.name);

	if (error)

		return error;



	if (!request_region(amd756_ioport, SMB_IOSIZE, amd756_driver.name)) {

		dev_err(&pdev->dev, "SMB region 0x%x already in use!\n",

			amd756_ioport);

drivers/i2c/busses/i2c-amd8111.c

+5 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/init.h>

#include <linux/i2c.h>

#include <linux/delay.h>

#include <linux/acpi.h>

#include <asm/io.h>



MODULE_LICENSE("GPL");
@@ -374,6 +375,10 @@ static int __devinit amd8111_probe(struct pci_dev *dev, 
	smbus->base = pci_resource_start(dev, 0);

	smbus->size = pci_resource_len(dev, 0);



	error = acpi_check_resource_conflict(&dev->resource[0]);

	if (error)

		goto out_kfree;



	if (!request_region(smbus->base, smbus->size, amd8111_driver.name)) {

		error = -EBUSY;

		goto out_kfree;