Commit 867b6824 authored by Pavel Machek's avatar Pavel Machek Committed by Pavel
Browse files

leds: lm3642: remove warnings for bad strtol, cleanup gotos 



Bad string from userspace is not worth printing warning on; gotos that
just directly return are not good, plus a comment fix.

Cc: jacek.anaszewski@gmail.com, linux-leds@vger.kernel.org, linux-kernel@vger.kernel.org, dmurphy@ti.com
Signed-off-by: default avatarPavel Machek <pavel@ucw.cz>
parent 445da487

drivers/leds/leds-lm3642.c

+14 −23
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ static int lm3642_control(struct lm3642_chip_data *chip, 
	ret = regmap_read(chip->regmap, REG_FLAG, &chip->last_flag);

	if (ret < 0) {

		dev_err(chip->dev, "Failed to read REG_FLAG Register\n");

		goto out;

		return ret;

	}



	if (chip->last_flag)
@@ -146,11 +146,11 @@ static int lm3642_control(struct lm3642_chip_data *chip, 
		break;



	default:

		return ret;

		return -EINVAL;

	}

	if (ret < 0) {

		dev_err(chip->dev, "Failed to write REG_I_CTRL Register\n");

		goto out;

		return ret;

	}



	if (chip->tx_pin)
@@ -159,7 +159,6 @@ static int lm3642_control(struct lm3642_chip_data *chip, 
	ret = regmap_update_bits(chip->regmap, REG_ENABLE,

				 MODE_BITS_MASK << MODE_BITS_SHIFT,

				 opmode << MODE_BITS_SHIFT);

out:

	return ret;

}
@@ -178,7 +177,7 @@ static ssize_t lm3642_torch_pin_store(struct device *dev, 


	ret = kstrtouint(buf, 10, &state);

	if (ret)

		goto out_strtoint;

		return ret;

	if (state != 0)

		state = 0x01 << TORCH_PIN_EN_SHIFT;
@@ -186,16 +185,12 @@ static ssize_t lm3642_torch_pin_store(struct device *dev, 
	ret = regmap_update_bits(chip->regmap, REG_ENABLE,

				 TORCH_PIN_EN_MASK << TORCH_PIN_EN_SHIFT,

				 state);

	if (ret < 0)

		goto out;



	return size;

out:

	if (ret < 0) {

		dev_err(chip->dev, "%s:i2c access fail to register\n", __func__);

		return ret;

out_strtoint:

	dev_err(chip->dev, "%s: fail to change str to int\n", __func__);

	return ret;

	}



	return size;

}



static DEVICE_ATTR(torch_pin, S_IWUSR, NULL, lm3642_torch_pin_store);
@@ -229,7 +224,7 @@ static ssize_t lm3642_strobe_pin_store(struct device *dev, 


	ret = kstrtouint(buf, 10, &state);

	if (ret)

		goto out_strtoint;

		return ret;

	if (state != 0)

		state = 0x01 << STROBE_PIN_EN_SHIFT;
@@ -237,16 +232,12 @@ static ssize_t lm3642_strobe_pin_store(struct device *dev, 
	ret = regmap_update_bits(chip->regmap, REG_ENABLE,

				 STROBE_PIN_EN_MASK << STROBE_PIN_EN_SHIFT,

				 state);

	if (ret < 0)

		goto out;



	return size;

out:

	if (ret < 0) {

		dev_err(chip->dev, "%s:i2c access fail to register\n", __func__);

		return ret;

out_strtoint:

	dev_err(chip->dev, "%s: fail to change str to int\n", __func__);

	return ret;

	}



	return size;

}



static DEVICE_ATTR(strobe_pin, S_IWUSR, NULL, lm3642_strobe_pin_store);

CRA Git | Maintained and supported by SUSTech CRA and CCSE