Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mfd: bxtwc: Remove unnecessary i2c_addr checks in ipc calls

Browse source 
In the following code block, BXTWC_DEVICE1_ADDR value is
already fixed and hence there no need to check for
if (!i2c_addr) in every ipc read/write calls. Even if this
check is required it can be moved to probe function.

i2c_addr = BXTWC_DEVICE1_ADDR;
if (!i2c_addr) {
	dev_err(pmic->dev, "I2C address not set\n");
	return -EINVAL;
}

This patch remove this extra check and adds some NULL
parameter checks.

Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
This commit is contained in:
Kuppuswamy Sathyanarayanan 2017-03-30 16:35:40 -07:00 committed by Lee Jones
parent 4407319d8f
commit b4ccc4d2e8
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
drivers/mfd/intel_soc_pmic_bxtwc.c
View file

@ -238,15 +238,14 @@ static int regmap_ipc_byte_reg_read(void *context, unsigned int reg,
u8 ipc_out[4]; u8 ipc_out[4];
struct intel_soc_pmic *pmic = context; struct intel_soc_pmic *pmic = context;
if (!pmic)
return -EINVAL;
if (reg & REG_ADDR_MASK) if (reg & REG_ADDR_MASK)
i2c_addr = (reg & REG_ADDR_MASK) >> REG_ADDR_SHIFT; i2c_addr = (reg & REG_ADDR_MASK) >> REG_ADDR_SHIFT;
else { else
i2c_addr = BXTWC_DEVICE1_ADDR; i2c_addr = BXTWC_DEVICE1_ADDR;
if (!i2c_addr) {
dev_err(pmic->dev, "I2C address not set\n");
return -EINVAL;
}
}
reg &= REG_OFFSET_MASK; reg &= REG_OFFSET_MASK;
ipc_in[0] = reg; ipc_in[0] = reg;
@ -271,15 +270,14 @@ static int regmap_ipc_byte_reg_write(void *context, unsigned int reg,
u8 ipc_in[3]; u8 ipc_in[3];
struct intel_soc_pmic *pmic = context; struct intel_soc_pmic *pmic = context;
if (!pmic)
return -EINVAL;
if (reg & REG_ADDR_MASK) if (reg & REG_ADDR_MASK)
i2c_addr = (reg & REG_ADDR_MASK) >> REG_ADDR_SHIFT; i2c_addr = (reg & REG_ADDR_MASK) >> REG_ADDR_SHIFT;
else { else
i2c_addr = BXTWC_DEVICE1_ADDR; i2c_addr = BXTWC_DEVICE1_ADDR;
if (!i2c_addr) {
dev_err(pmic->dev, "I2C address not set\n");
return -EINVAL;
}
}
reg &= REG_OFFSET_MASK; reg &= REG_OFFSET_MASK;
ipc_in[0] = reg; ipc_in[0] = reg;