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

Commit b4ccc4d2 authored by Kuppuswamy Sathyanarayanan's avatar Kuppuswamy Sathyanarayanan Committed by Lee Jones
Browse files

mfd: bxtwc: Remove unnecessary i2c_addr checks in ipc calls 



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: default avatarKuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent 4407319d

drivers/mfd/intel_soc_pmic_bxtwc.c

+10 −12
Original line number Diff line number Diff line
@@ -238,15 +238,14 @@ static int regmap_ipc_byte_reg_read(void *context, unsigned int reg, 
	u8 ipc_out[4];

	struct intel_soc_pmic *pmic = context;



	if (!pmic)

		return -EINVAL;



	if (reg & REG_ADDR_MASK)

		i2c_addr = (reg & REG_ADDR_MASK) >> REG_ADDR_SHIFT;

	else {

	else

		i2c_addr = BXTWC_DEVICE1_ADDR;

		if (!i2c_addr) {

			dev_err(pmic->dev, "I2C address not set\n");

			return -EINVAL;

		}

	}



	reg &= REG_OFFSET_MASK;



	ipc_in[0] = reg;
@@ -271,15 +270,14 @@ static int regmap_ipc_byte_reg_write(void *context, unsigned int reg, 
	u8 ipc_in[3];

	struct intel_soc_pmic *pmic = context;



	if (!pmic)

		return -EINVAL;



	if (reg & REG_ADDR_MASK)

		i2c_addr = (reg & REG_ADDR_MASK) >> REG_ADDR_SHIFT;

	else {

	else

		i2c_addr = BXTWC_DEVICE1_ADDR;

		if (!i2c_addr) {

			dev_err(pmic->dev, "I2C address not set\n");

			return -EINVAL;

		}

	}



	reg &= REG_OFFSET_MASK;



	ipc_in[0] = reg;