summaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorWolfram Sang <wsa@the-dreams.de>2015-08-20 23:40:46 +0200
committerWolfram Sang <wsa@the-dreams.de>2015-09-03 11:54:41 +0200
commitfce388afd633cdf20844e17f47b0d97c7ee06e69 (patch)
tree4e6141c644bce1eb3ca47858d38f6974bde0cb69 /drivers/i2c
parentbdbf4a29ee5bbe5b6743ba47bc7b10ec2cba8b21 (diff)
downloadop-kernel-dev-fce388afd633cdf20844e17f47b0d97c7ee06e69.zip
op-kernel-dev-fce388afd633cdf20844e17f47b0d97c7ee06e69.tar.gz
i2c: mux: reg: simplify register size checking
Checking was done at three different locations, just do it once and properly at probing time. Signed-off-by: Wolfram Sang <wsa@the-dreams.de> Tested-by: York Sun <yorksun@freescale.com>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/muxes/i2c-mux-reg.c17
1 files changed, 6 insertions, 11 deletions
diff --git a/drivers/i2c/muxes/i2c-mux-reg.c b/drivers/i2c/muxes/i2c-mux-reg.c
index 57ec57e..fb5b55a0c 100644
--- a/drivers/i2c/muxes/i2c-mux-reg.c
+++ b/drivers/i2c/muxes/i2c-mux-reg.c
@@ -59,9 +59,6 @@ static int i2c_mux_reg_set(const struct regmux *mux, unsigned int chan_id)
if (!mux->data.write_only)
ioread8(mux->data.reg);
break;
- default:
- pr_err("Invalid register size\n");
- return -EINVAL;
}
return 0;
@@ -155,10 +152,6 @@ static int i2c_mux_reg_probe_dt(struct regmux *mux,
/* map address from "reg" if exists */
if (of_address_to_resource(np, 0, &res)) {
mux->data.reg_size = resource_size(&res);
- if (mux->data.reg_size > 4) {
- dev_err(&pdev->dev, "Invalid address size\n");
- return -EINVAL;
- }
mux->data.reg = devm_ioremap_resource(&pdev->dev, &res);
if (IS_ERR(mux->data.reg))
return PTR_ERR(mux->data.reg);
@@ -211,15 +204,17 @@ static int i2c_mux_reg_probe(struct platform_device *pdev)
"Register not set, using platform resource\n");
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
mux->data.reg_size = resource_size(res);
- if (mux->data.reg_size > 4) {
- dev_err(&pdev->dev, "Invalid resource size\n");
- return -EINVAL;
- }
mux->data.reg = devm_ioremap_resource(&pdev->dev, res);
if (IS_ERR(mux->data.reg))
return PTR_ERR(mux->data.reg);
}
+ if (mux->data.reg_size != 4 && mux->data.reg_size != 2 &&
+ mux->data.reg_size != 1) {
+ dev_err(&pdev->dev, "Invalid register size\n");
+ return -EINVAL;
+ }
+
mux->adap = devm_kzalloc(&pdev->dev,
sizeof(*mux->adap) * mux->data.n_values,
GFP_KERNEL);
OpenPOWER on IntegriCloud