Commit d6072f84 authored by Jean Delvare's avatar Jean Delvare Committed by Greg Kroah-Hartman
Browse files

[PATCH] i2c: Reuse name strings in i2c bus drivers 



Clean up name string usage in 12 i2c bus drivers:
* Use the i2c_adapter name for requesting the I/O region rather than
  redefining a new string.
* Do not initialize the i2c_adapter name to "unset".
This should save a few data bytes here and there.

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>

 drivers/i2c/busses/i2c-ali1535.c |    6 +++---
 drivers/i2c/busses/i2c-ali1563.c |    6 ++++--
 drivers/i2c/busses/i2c-ali15x3.c |    5 +++--
 drivers/i2c/busses/i2c-amd756.c  |    5 ++---
 drivers/i2c/busses/i2c-amd8111.c |    4 +++-
 drivers/i2c/busses/i2c-i801.c    |    4 ++--
 drivers/i2c/busses/i2c-nforce2.c |    4 ++--
 drivers/i2c/busses/i2c-piix4.c   |    4 ++--
 drivers/i2c/busses/i2c-sis5595.c |    5 +++--
 drivers/i2c/busses/i2c-sis630.c  |    6 ++++--
 drivers/i2c/busses/i2c-sis96x.c  |    5 +++--
 drivers/i2c/busses/i2c-via.c     |    4 ++--
 12 files changed, 33 insertions(+), 25 deletions(-)
parent 7d845b10

drivers/i2c/busses/i2c-ali1535.c

+3 −3
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ 
					/*  -> Read  = 1		*/

#define	ALI1535_SMBIO_EN	0x04	/* SMB I/O Space enable		*/





static struct pci_driver ali1535_driver;

static unsigned short ali1535_smba;

static DECLARE_MUTEX(i2c_ali1535_sem);
@@ -162,7 +162,8 @@ static int ali1535_setup(struct pci_dev *dev) 
		goto exit;

	}



	if (!request_region(ali1535_smba, ALI1535_SMB_IOSIZE, "ali1535-smb")) {

	if (!request_region(ali1535_smba, ALI1535_SMB_IOSIZE,

			    ali1535_driver.name)) {

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

			ali1535_smba);

		goto exit;
@@ -480,7 +481,6 @@ static struct i2c_adapter ali1535_adapter = { 
	.owner		= THIS_MODULE,

	.class          = I2C_CLASS_HWMON,

	.algo		= &smbus_algorithm,

	.name		= "unset",

};



static struct pci_device_id ali1535_ids[] = {

drivers/i2c/busses/i2c-ali1563.c

+4 −2
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 


#define HST_CNTL2_SIZEMASK	0x38



static struct pci_driver ali1563_pci_driver;

static unsigned short ali1563_smba;



static int ali1563_transaction(struct i2c_adapter * a, int size)
@@ -350,7 +351,8 @@ static int __devinit ali1563_setup(struct pci_dev * dev) 
		dev_warn(&dev->dev,"ali1563_smba Uninitialized\n");

		goto Err;

	}

	if (!request_region(ali1563_smba,ALI1563_SMB_IOSIZE,"i2c-ali1563")) {

	if (!request_region(ali1563_smba, ALI1563_SMB_IOSIZE,

			    ali1563_pci_driver.name)) {

		dev_warn(&dev->dev,"Could not allocate I/O space");

		goto Err;

	}
@@ -406,7 +408,7 @@ static struct pci_device_id __devinitdata ali1563_id_table[] = { 
MODULE_DEVICE_TABLE (pci, ali1563_id_table);



static struct pci_driver ali1563_pci_driver = {

 	.name		= "ali1563_i2c",

 	.name		= "ali1563_smbus",

	.id_table	= ali1563_id_table,

 	.probe		= ali1563_probe,

	.remove		= __devexit_p(ali1563_remove),

drivers/i2c/busses/i2c-ali15x3.c

+3 −2
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ module_param(force_addr, ushort, 0); 
MODULE_PARM_DESC(force_addr,

		 "Initialize the base address of the i2c controller");



static struct pci_driver ali15x3_driver;

static unsigned short ali15x3_smba;



static int ali15x3_setup(struct pci_dev *ALI15X3_dev)
@@ -166,7 +167,8 @@ static int ali15x3_setup(struct pci_dev *ALI15X3_dev) 
	if(force_addr)

		ali15x3_smba = force_addr & ~(ALI15X3_SMB_IOSIZE - 1);



	if (!request_region(ali15x3_smba, ALI15X3_SMB_IOSIZE, "ali15x3-smb")) {

	if (!request_region(ali15x3_smba, ALI15X3_SMB_IOSIZE,

			    ali15x3_driver.name)) {

		dev_err(&ALI15X3_dev->dev,

			"ALI15X3_smb region 0x%x already in use!\n",

			ali15x3_smba);
@@ -470,7 +472,6 @@ static struct i2c_adapter ali15x3_adapter = { 
	.owner		= THIS_MODULE,

	.class          = I2C_CLASS_HWMON,

	.algo		= &smbus_algorithm,

	.name		= "unset",

};



static struct pci_device_id ali15x3_ids[] = {

drivers/i2c/busses/i2c-amd756.c

+2 −3
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ 
#define AMD756_PROCESS_CALL	0x04

#define AMD756_BLOCK_DATA	0x05





static struct pci_driver amd756_driver;

static unsigned short amd756_ioport;



/*
@@ -303,7 +303,6 @@ struct i2c_adapter amd756_smbus = { 
	.owner		= THIS_MODULE,

	.class          = I2C_CLASS_HWMON,

	.algo		= &smbus_algorithm,

	.name		= "unset",

};



enum chiptype { AMD756, AMD766, AMD768, NFORCE, AMD8111 };
@@ -365,7 +364,7 @@ static int __devinit amd756_probe(struct pci_dev *pdev, 
		amd756_ioport += SMB_ADDR_OFFSET;

	}



	if (!request_region(amd756_ioport, SMB_IOSIZE, "amd756-smbus")) {

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

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

			amd756_ioport);

		return -ENODEV;

drivers/i2c/busses/i2c-amd8111.c

+3 −1
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ struct amd_smbus { 
	int size;

};



static struct pci_driver amd8111_driver;



/*

 * AMD PCI control registers definitions.

 */
@@ -352,7 +354,7 @@ static int __devinit amd8111_probe(struct pci_dev *dev, const struct pci_device_ 
	smbus->base = pci_resource_start(dev, 0);

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



	if (!request_region(smbus->base, smbus->size, "amd8111 SMBus 2.0"))

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

		goto out_kfree;



	smbus->adapter.owner = THIS_MODULE;

CRA Git | Maintained and supported by SUSTech CRA and CCSE