Patchwork [3/3] i2c: Make I2C ID tables non-mandatory for DT'ed and/or ACPI'ed devices

login
register
mail settings
Submitter Lee Jones
Date June 2, 2014, 1:41 p.m.
Message ID <1401716463-23457-4-git-send-email-lee.jones@linaro.org>
Download mbox | patch
Permalink /patch/354885/
State Superseded
Headers show

Comments

Lee Jones - June 2, 2014, 1:41 p.m.
Currently the I2C framework insists on devices supplying an I2C ID
table.  Many of the devices which do so unnecessarily adding quite a
few wasted lines to kernel code.  This patch allows drivers a means
to 'not' supply the aforementioned table and match on either DT
and/or ACPI match tables instead.

Signed-off-by: Lee Jones <lee.jones@linaro.org>
---
 drivers/i2c/i2c-core.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
One Thousand Gnomes - June 2, 2014, 2:34 p.m.
On Mon,  2 Jun 2014 14:41:03 +0100
Lee Jones <lee.jones@linaro.org> wrote:

> Currently the I2C framework insists on devices supplying an I2C ID
> table.  Many of the devices which do so unnecessarily adding quite a
> few wasted lines to kernel code.  This patch allows drivers a means
> to 'not' supply the aforementioned table and match on either DT
> and/or ACPI match tables instead.
> 
> Signed-off-by: Lee Jones <lee.jones@linaro.org>
> ---
>  drivers/i2c/i2c-core.c | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
> index d0c7180..811b78f 100644
> --- a/drivers/i2c/i2c-core.c
> +++ b/drivers/i2c/i2c-core.c
> @@ -271,7 +271,18 @@ static int i2c_device_probe(struct device *dev)
>  		return 0;
>  
>  	driver = to_i2c_driver(dev->driver);
> -	if (!driver->probe || !driver->id_table)
> +	if (!driver->probe)
> +		return -EINVAL;
> +
> +	/*
> +	 * An I2C ID table is not madatory, if and only if, a suitable Device

typo "madatory"..

> +	 * Tree and/or ACPI match table entry is supplied for the probing
> +	 * device.
> +	 *
> +	 * TODO: Provide 'device type' to 'ACPI node' call and match here.
> +	 */
> +	if (!driver->id_table &&
> +	    !of_match_device(dev->driver->of_match_table, dev))
>  		return -ENODEV;
>  

Looks sensible to me other than that.

>  	if (!device_can_wakeup(&client->dev))
--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Grant Likely - June 2, 2014, 4:08 p.m.
On Mon,  2 Jun 2014 14:41:03 +0100, Lee Jones <lee.jones@linaro.org> wrote:
> Currently the I2C framework insists on devices supplying an I2C ID
> table.  Many of the devices which do so unnecessarily adding quite a
> few wasted lines to kernel code.  This patch allows drivers a means
> to 'not' supply the aforementioned table and match on either DT
> and/or ACPI match tables instead.
> 
> Signed-off-by: Lee Jones <lee.jones@linaro.org>

Looks reasonable.

g.

> ---
>  drivers/i2c/i2c-core.c | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
> index d0c7180..811b78f 100644
> --- a/drivers/i2c/i2c-core.c
> +++ b/drivers/i2c/i2c-core.c
> @@ -271,7 +271,18 @@ static int i2c_device_probe(struct device *dev)
>  		return 0;
>  
>  	driver = to_i2c_driver(dev->driver);
> -	if (!driver->probe || !driver->id_table)
> +	if (!driver->probe)
> +		return -EINVAL;
> +
> +	/*
> +	 * An I2C ID table is not madatory, if and only if, a suitable Device
> +	 * Tree and/or ACPI match table entry is supplied for the probing
> +	 * device.
> +	 *
> +	 * TODO: Provide 'device type' to 'ACPI node' call and match here.
> +	 */
> +	if (!driver->id_table &&
> +	    !of_match_device(dev->driver->of_match_table, dev))
>  		return -ENODEV;
>  
>  	if (!device_can_wakeup(&client->dev))
> -- 
> 1.8.3.2
> 

--
To unsubscribe from this list: send the line "unsubscribe linux-i2c" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Lee Jones - June 3, 2014, 8:11 a.m.
On Mon, 02 Jun 2014, Grant Likely wrote:
> On Mon,  2 Jun 2014 14:41:03 +0100, Lee Jones <lee.jones@linaro.org> wrote:
> > Currently the I2C framework insists on devices supplying an I2C ID
> > table.  Many of the devices which do so unnecessarily adding quite a
> > few wasted lines to kernel code.  This patch allows drivers a means
> > to 'not' supply the aforementioned table and match on either DT
> > and/or ACPI match tables instead.
> > 
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> 
> Looks reasonable.

Can I add your Ack?

> g.
> 
> > ---
> >  drivers/i2c/i2c-core.c | 13 ++++++++++++-
> >  1 file changed, 12 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
> > index d0c7180..811b78f 100644
> > --- a/drivers/i2c/i2c-core.c
> > +++ b/drivers/i2c/i2c-core.c
> > @@ -271,7 +271,18 @@ static int i2c_device_probe(struct device *dev)
> >  		return 0;
> >  
> >  	driver = to_i2c_driver(dev->driver);
> > -	if (!driver->probe || !driver->id_table)
> > +	if (!driver->probe)
> > +		return -EINVAL;
> > +
> > +	/*
> > +	 * An I2C ID table is not madatory, if and only if, a suitable Device
> > +	 * Tree and/or ACPI match table entry is supplied for the probing
> > +	 * device.
> > +	 *
> > +	 * TODO: Provide 'device type' to 'ACPI node' call and match here.
> > +	 */
> > +	if (!driver->id_table &&
> > +	    !of_match_device(dev->driver->of_match_table, dev))
> >  		return -ENODEV;
> >  
> >  	if (!device_can_wakeup(&client->dev))
>
Lee Jones - June 3, 2014, 8:11 a.m.
On Mon, 02 Jun 2014, One Thousand Gnomes wrote:

> On Mon,  2 Jun 2014 14:41:03 +0100
> Lee Jones <lee.jones@linaro.org> wrote:
> 
> > Currently the I2C framework insists on devices supplying an I2C ID
> > table.  Many of the devices which do so unnecessarily adding quite a
> > few wasted lines to kernel code.  This patch allows drivers a means
> > to 'not' supply the aforementioned table and match on either DT
> > and/or ACPI match tables instead.
> > 
> > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > ---
> >  drivers/i2c/i2c-core.c | 13 ++++++++++++-
> >  1 file changed, 12 insertions(+), 1 deletion(-)
> > 
> > diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
> > index d0c7180..811b78f 100644
> > --- a/drivers/i2c/i2c-core.c
> > +++ b/drivers/i2c/i2c-core.c
> > @@ -271,7 +271,18 @@ static int i2c_device_probe(struct device *dev)
> >  		return 0;
> >  
> >  	driver = to_i2c_driver(dev->driver);
> > -	if (!driver->probe || !driver->id_table)
> > +	if (!driver->probe)
> > +		return -EINVAL;
> > +
> > +	/*
> > +	 * An I2C ID table is not madatory, if and only if, a suitable Device
> 
> typo "madatory"..
> 
> > +	 * Tree and/or ACPI match table entry is supplied for the probing
> > +	 * device.
> > +	 *
> > +	 * TODO: Provide 'device type' to 'ACPI node' call and match here.
> > +	 */
> > +	if (!driver->id_table &&
> > +	    !of_match_device(dev->driver->of_match_table, dev))
> >  		return -ENODEV;
> >  
> 
> Looks sensible to me other than that.

Can I add your Ack once the typo is fixed?

> >  	if (!device_can_wakeup(&client->dev))
Grant Likely - June 3, 2014, 9:18 a.m.
On Tue, 3 Jun 2014 09:11:09 +0100, Lee Jones <lee.jones@linaro.org> wrote:
> On Mon, 02 Jun 2014, Grant Likely wrote:
> > On Mon,  2 Jun 2014 14:41:03 +0100, Lee Jones <lee.jones@linaro.org> wrote:
> > > Currently the I2C framework insists on devices supplying an I2C ID
> > > table.  Many of the devices which do so unnecessarily adding quite a
> > > few wasted lines to kernel code.  This patch allows drivers a means
> > > to 'not' supply the aforementioned table and match on either DT
> > > and/or ACPI match tables instead.
> > > 
> > > Signed-off-by: Lee Jones <lee.jones@linaro.org>
> > 
> > Looks reasonable.
> 
> Can I add your Ack?

Acked-by: Grant Likely <grant.likely@linaro.org>

> 
> > g.
> > 
> > > ---
> > >  drivers/i2c/i2c-core.c | 13 ++++++++++++-
> > >  1 file changed, 12 insertions(+), 1 deletion(-)
> > > 
> > > diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
> > > index d0c7180..811b78f 100644
> > > --- a/drivers/i2c/i2c-core.c
> > > +++ b/drivers/i2c/i2c-core.c
> > > @@ -271,7 +271,18 @@ static int i2c_device_probe(struct device *dev)
> > >  		return 0;
> > >  
> > >  	driver = to_i2c_driver(dev->driver);
> > > -	if (!driver->probe || !driver->id_table)
> > > +	if (!driver->probe)
> > > +		return -EINVAL;
> > > +
> > > +	/*
> > > +	 * An I2C ID table is not madatory, if and only if, a suitable Device
> > > +	 * Tree and/or ACPI match table entry is supplied for the probing
> > > +	 * device.
> > > +	 *
> > > +	 * TODO: Provide 'device type' to 'ACPI node' call and match here.
> > > +	 */
> > > +	if (!driver->id_table &&
> > > +	    !of_match_device(dev->driver->of_match_table, dev))
> > >  		return -ENODEV;
> > >  
> > >  	if (!device_can_wakeup(&client->dev))
> > 
> 
> -- 
> Lee Jones
> Linaro STMicroelectronics Landing Team Lead
> Linaro.org │ Open source software for ARM SoCs
> Follow Linaro: Facebook | Twitter | Blog

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

Patch

diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index d0c7180..811b78f 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -271,7 +271,18 @@  static int i2c_device_probe(struct device *dev)
 		return 0;
 
 	driver = to_i2c_driver(dev->driver);
-	if (!driver->probe || !driver->id_table)
+	if (!driver->probe)
+		return -EINVAL;
+
+	/*
+	 * An I2C ID table is not madatory, if and only if, a suitable Device
+	 * Tree and/or ACPI match table entry is supplied for the probing
+	 * device.
+	 *
+	 * TODO: Provide 'device type' to 'ACPI node' call and match here.
+	 */
+	if (!driver->id_table &&
+	    !of_match_device(dev->driver->of_match_table, dev))
 		return -ENODEV;
 
 	if (!device_can_wakeup(&client->dev))