linux-i2c.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>
To: linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Cc: linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
	Magnus Damm <magnus.damm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>,
	Simon Horman <horms-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org>,
	Laurent Pinchart
	<laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org>,
	Geert Uytterhoeven
	<geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org>,
	Wolfram Sang <wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>,
	Andrey Danin <danindrey-JGs/UdohzUI@public.gmane.org>,
	linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
Subject: [RFC 6/9] i2c: make address check indpendent from client struct
Date: Fri, 17 Jul 2015 16:08:26 +0200	[thread overview]
Message-ID: <1437142109-31975-7-git-send-email-wsa@the-dreams.de> (raw)
In-Reply-To: <1437142109-31975-1-git-send-email-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>

From: Wolfram Sang <wsa+renesas-jBu1N2QxHDJrcw3mvpCnnVaTQe2KTcn/@public.gmane.org>

We want to use this function with struct boardinfo soon, so let's just
pass the parameters really needed. We also extend the type of addr, so
more types can be input. Remove a superfluous dangling comment while
here.

Signed-off-by: Wolfram Sang <wsa+renesas-jBu1N2QxHDJrcw3mvpCnnVaTQe2KTcn/@public.gmane.org>
---
 drivers/i2c/i2c-core.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index b54a0f092d53f6..b5719a2cff97bf 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -793,15 +793,15 @@ static unsigned short i2c_encode_flags_to_addr(struct i2c_client *client)
 
 /* This is a permissive address validity check, I2C address map constraints
  * are purposely not enforced, except for the general call address. */
-static int i2c_check_addr_validity(const struct i2c_client *client)
+static int i2c_check_addr_validity(unsigned addr, unsigned short flags)
 {
-	if (client->flags & I2C_CLIENT_TEN) {
+	if (flags & I2C_CLIENT_TEN) {
 		/* 10-bit address, all values are valid */
-		if (client->addr > 0x3ff)
+		if (addr > 0x3ff)
 			return -EINVAL;
 	} else {
 		/* 7-bit address, reject the general call address */
-		if (client->addr == 0x00 || client->addr > 0x7f)
+		if (addr == 0x00 || addr > 0x7f)
 			return -EINVAL;
 	}
 	return 0;
@@ -979,8 +979,7 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info)
 
 	strlcpy(client->name, info->type, sizeof(client->name));
 
-	/* Check for address validity */
-	status = i2c_check_addr_validity(client);
+	status = i2c_check_addr_validity(client->addr, client->flags);
 	if (status) {
 		dev_err(&adap->dev, "Invalid %d-bit I2C address 0x%02hx\n",
 			client->flags & I2C_CLIENT_TEN ? 10 : 7, client->addr);
-- 
2.1.4

  parent reply	other threads:[~2015-07-17 14:08 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-17 14:08 [RFC 0/9] i2c: slave: improve i2c client address spaces and their DT support Wolfram Sang
     [not found] ` <1437142109-31975-1-git-send-email-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>
2015-07-17 14:08   ` [RFC 1/9] i2c: tegra: implement slave mode Wolfram Sang
2015-07-17 14:08   ` [RFC 2/9] dt-bindings: add header for generic I2C flags in bindings Wolfram Sang
2015-07-17 14:08   ` [RFC 3/9] i2c: add a flag to mark clients as slaves Wolfram Sang
2015-07-17 14:08   ` Wolfram Sang [this message]
2015-07-17 14:08   ` [RFC 8/9] i2c: take address space into account when checking for used addresses Wolfram Sang
2015-07-17 14:08   ` [RFC 9/9] dts: tegra: WIP: hack dts to test new dt flags for i2c Wolfram Sang
2015-07-17 14:11     ` Wolfram Sang
2015-07-20  7:28     ` Andrey Danin
2015-07-20  9:03       ` Wolfram Sang
     [not found]     ` <1437142109-31975-10-git-send-email-wsa-z923LK4zBo2bacvFa/9K2g@public.gmane.org>
2015-07-20  7:53       ` Laurent Pinchart
2015-07-20  8:45         ` Wolfram Sang
2015-07-20 16:10           ` Rob Herring
2015-07-20 22:09             ` Stephen Warren
     [not found]               ` <55AD71A6.4030105-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2015-07-21  6:55                 ` Wolfram Sang
2015-07-20 22:13   ` [RFC 0/9] i2c: slave: improve i2c client address spaces and their DT support Stephen Warren
     [not found]     ` <55AD7279.5090203-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>
2015-07-21  7:00       ` Wolfram Sang
2015-07-17 14:08 ` [RFC 4/9] i2c: apply address offset for slaves, too Wolfram Sang
2015-07-17 14:08 ` [RFC 5/9] i2c: rename address check functions Wolfram Sang
2015-07-17 14:08 ` [RFC 7/9] i2c: apply DT flags when probing Wolfram Sang
2015-07-20  7:23 ` [RFC 0/9] i2c: slave: improve i2c client address spaces and their DT support Andrey Danin
     [not found]   ` <55ACA1D8.6010403-JGs/UdohzUI@public.gmane.org>
2015-07-20  8:52     ` Wolfram Sang
2015-07-20  8:59 ` Andrey Danin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1437142109-31975-7-git-send-email-wsa@the-dreams.de \
    --to=wsa-z923lk4zbo2bacvfa/9k2g@public.gmane.org \
    --cc=danindrey-JGs/UdohzUI@public.gmane.org \
    --cc=geert-Td1EMuHUCqxL1ZNQvxDV9g@public.gmane.org \
    --cc=horms-/R6kz+dDXgpPR4JQBCEnsQ@public.gmane.org \
    --cc=laurent.pinchart-ryLnwIuWjnjg/C1BVhZhaw@public.gmane.org \
    --cc=linux-i2c-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-sh-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
    --cc=magnus.damm-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).