Re: [PATCH] i2c: mux: reg: simplify register size checking

[Wolfram Sang]

On Thu, Aug 20, 2015 at 11:40:46PM +0200, Wolfram Sang wrote:
> Checking was done at three different locations, just do it once and
> properly at probing time.
> 
> Signed-off-by: Wolfram Sang 
> Cc: York Sun 

Applied to for-next, thanks!



signature.asc
Description: Digital signature

Re: [PATCH] i2c: mux: reg: simplify register size checking

[Wolfram Sang]

On Fri, Aug 21, 2015 at 03:26:23AM +, York Sun wrote:
> Sorry for top posting, I am out and replying using web access.
> 
> This patch looks OK. I cannot test it until earliest next Friday.

Did you have the chance to test it?

Thanks,

   Wolfram



signature.asc
Description: Digital signature

Re: [PATCH] i2c: mux: reg: simplify register size checking

[York Sun]

On 08/31/2015 03:24 PM, Wolfram Sang wrote:
> On Fri, Aug 21, 2015 at 03:26:23AM +, York Sun wrote:
>> Sorry for top posting, I am out and replying using web access.
>>
>> This patch looks OK. I cannot test it until earliest next Friday.
> 
> Did you have the chance to test it?
> 

I am working on it. My hardware was replaced with a new version. I am running my
driver now. Will try your patch and confirm.

York

--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] i2c: mux: reg: simplify register size checking

[York Sun]

On 08/20/2015 04:40 PM, Wolfram Sang wrote:
> Checking was done at three different locations, just do it once and
> properly at probing time.
> 
> Signed-off-by: Wolfram Sang 
> Cc: York Sun 
> ---
> 
> York Sun: Can you test this patch? I can only build test.

Patch is OK. Verified on hardware with good and intentional bad values.

Acked-by: York Sun 

--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH] i2c: mux: reg: simplify register size checking

[York Sun]

Sorry for top posting, I am out and replying using web access.

This patch looks OK. I cannot test it until earliest next Friday.

York



From: Wolfram Sang w...@the-dreams.de
Sent: Thursday, August 20, 2015 2:40 PM
To: linux-i2c@vger.kernel.org
Cc: Wolfram Sang; Sun York-R58495
Subject: [PATCH] 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 w...@the-dreams.de
Cc: York Sun york...@freescale.com
---

York Sun: Can you test this patch? I can only build test.

 drivers/i2c/muxes/i2c-mux-reg.c | 17 ++---
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/drivers/i2c/muxes/i2c-mux-reg.c b/drivers/i2c/muxes/i2c-mux-reg.c
index 86d41d36a78340..da8926d816c8cc 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;
@@ -154,10 +151,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);
@@ -210,15 +203,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);
--
2.1.4

--
To unsubscribe from this list: send the line unsubscribe linux-i2c in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] i2c: mux: reg: simplify register size checking

[Wolfram Sang]

Checking was done at three different locations, just do it once and
properly at probing time.

Signed-off-by: Wolfram Sang w...@the-dreams.de
Cc: York Sun york...@freescale.com
---

York Sun: Can you test this patch? I can only build test.

 drivers/i2c/muxes/i2c-mux-reg.c | 17 ++---
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/drivers/i2c/muxes/i2c-mux-reg.c b/drivers/i2c/muxes/i2c-mux-reg.c
index 86d41d36a78340..da8926d816c8cc 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;
@@ -154,10 +151,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);
@@ -210,15 +203,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);
-- 
2.1.4

--
To unsubscribe from this list: send the line unsubscribe linux-i2c in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html