leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpio: adnp: Make use of device properties

Browse Source 
Convert the module to be property provider agnostic and allow
it to be used on non-OF platforms.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
This commit is contained in:
Andy Shevchenko 2022-06-28 22:59:13 +03:00 committed by Bartosz Golaszewski
parent a2a15e1263
commit 8773bacefc
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/gpio/gpio-adnp.c
View File

@ -6,8 +6,9 @@
#include <linux/gpio/driver.h> #include <linux/gpio/driver.h>
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/mod_devicetable.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/of_irq.h> #include <linux/property.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/slab.h> #include <linux/slab.h>
@ -487,19 +488,15 @@ static int adnp_gpio_setup(struct adnp *adnp, unsigned int num_gpios,
static int adnp_i2c_probe(struct i2c_client *client) static int adnp_i2c_probe(struct i2c_client *client)
{ {
struct device_node *np = client->dev.of_node; struct device *dev = &client->dev;
struct adnp *adnp; struct adnp *adnp;
u32 num_gpios; u32 num_gpios;
int err; int err;
err = of_property_read_u32(np, "nr-gpios", &num_gpios); err = device_property_read_u32(dev, "nr-gpios", &num_gpios);
if (err < 0) if (err < 0)
return err; return err;
client->irq = irq_of_parse_and_map(np, 0);
if (!client->irq)
return -EPROBE_DEFER;
adnp = devm_kzalloc(&client->dev, sizeof(*adnp), GFP_KERNEL); adnp = devm_kzalloc(&client->dev, sizeof(*adnp), GFP_KERNEL);
if (!adnp) if (!adnp)
return -ENOMEM; return -ENOMEM;
@ -507,8 +504,7 @@ static int adnp_i2c_probe(struct i2c_client *client)
mutex_init(&adnp->i2c_lock); mutex_init(&adnp->i2c_lock);
adnp->client = client; adnp->client = client;
err = adnp_gpio_setup(adnp, num_gpios, err = adnp_gpio_setup(adnp, num_gpios, device_property_read_bool(dev, "interrupt-controller"));
of_property_read_bool(np, "interrupt-controller"));
if (err) if (err)
return err; return err;