Commit 93102cb4 authored by Terry Bowman's avatar Terry Bowman Committed by Wolfram Sang
Browse files

i2c: piix4: Replace hardcoded memory map size with a #define 



Replace number constant with #define to improve readability and
maintainability.

Signed-off-by: default avatarTerry Bowman <terry.bowman@amd.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Reviewed-by: default avatarJean Delvare <jdelvare@suse.de>
Signed-off-by: default avatarWolfram Sang <wsa@kernel.org>
parent 15fd6435

drivers/i2c/busses/i2c-piix4.c

+10 −6
Original line number Diff line number Diff line
@@ -77,6 +77,7 @@ 


/* SB800 constants */

#define SB800_PIIX4_SMB_IDX		0xcd6

#define SB800_PIIX4_SMB_MAP_SIZE	2



#define KERNCZ_IMC_IDX			0x3e

#define KERNCZ_IMC_DATA			0x3f
@@ -290,7 +291,8 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev, 
	else

		smb_en = (aux) ? 0x28 : 0x2c;



	if (!request_muxed_region(SB800_PIIX4_SMB_IDX, 2, "sb800_piix4_smb")) {

	if (!request_muxed_region(SB800_PIIX4_SMB_IDX, SB800_PIIX4_SMB_MAP_SIZE,

				  "sb800_piix4_smb")) {

		dev_err(&PIIX4_dev->dev,

			"SMB base address index region 0x%x already in use.\n",

			SB800_PIIX4_SMB_IDX);
@@ -302,7 +304,7 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev, 
	outb_p(smb_en + 1, SB800_PIIX4_SMB_IDX);

	smba_en_hi = inb_p(SB800_PIIX4_SMB_IDX + 1);



	release_region(SB800_PIIX4_SMB_IDX, 2);

	release_region(SB800_PIIX4_SMB_IDX, SB800_PIIX4_SMB_MAP_SIZE);



	if (!smb_en) {

		smb_en_status = smba_en_lo & 0x10;
@@ -371,7 +373,8 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev, 
			piix4_port_shift_sb800 = SB800_PIIX4_PORT_IDX_SHIFT;

		}

	} else {

		if (!request_muxed_region(SB800_PIIX4_SMB_IDX, 2,

		if (!request_muxed_region(SB800_PIIX4_SMB_IDX,

					  SB800_PIIX4_SMB_MAP_SIZE,

					  "sb800_piix4_smb")) {

			release_region(piix4_smba, SMBIOSIZE);

			return -EBUSY;
@@ -384,7 +387,7 @@ static int piix4_setup_sb800(struct pci_dev *PIIX4_dev, 
				       SB800_PIIX4_PORT_IDX;

		piix4_port_mask_sb800 = SB800_PIIX4_PORT_IDX_MASK;

		piix4_port_shift_sb800 = SB800_PIIX4_PORT_IDX_SHIFT;

		release_region(SB800_PIIX4_SMB_IDX, 2);

		release_region(SB800_PIIX4_SMB_IDX, SB800_PIIX4_SMB_MAP_SIZE);

	}



	dev_info(&PIIX4_dev->dev,
@@ -682,7 +685,8 @@ static s32 piix4_access_sb800(struct i2c_adapter *adap, u16 addr, 
	u8 port;

	int retval;



	if (!request_muxed_region(SB800_PIIX4_SMB_IDX, 2, "sb800_piix4_smb"))

	if (!request_muxed_region(SB800_PIIX4_SMB_IDX, SB800_PIIX4_SMB_MAP_SIZE,

				  "sb800_piix4_smb"))

		return -EBUSY;



	/* Request the SMBUS semaphore, avoid conflicts with the IMC */
@@ -758,7 +762,7 @@ static s32 piix4_access_sb800(struct i2c_adapter *adap, u16 addr, 
		piix4_imc_wakeup();



release:

	release_region(SB800_PIIX4_SMB_IDX, 2);

	release_region(SB800_PIIX4_SMB_IDX, SB800_PIIX4_SMB_MAP_SIZE);

	return retval;

}