From: Igor Grinberg <grinberg@compulab.co.il>
To: Christian Gmeiner <christian.gmeiner@gmail.com>
Cc: linux-kernel@vger.kernel.org, grant.likely@secretlab.ca
Subject: Re: pca953x: support working w/o platform data
Date: Fri, 01 Jul 2011 20:17:44 +0300 [thread overview]
Message-ID: <4E0E0138.8060400@compulab.co.il> (raw)
In-Reply-To: <BANLkTimSkDEzPvRMmX1O0YjjpoPzQt6_+w@mail.gmail.com>
On 07/01/11 14:33, Christian Gmeiner wrote:
> Provide defaults for pca953x, so the driver can be used w/o
> providing platform data.
Wouldn't it be better to provide a default pdata structure inside the driver
and use it in case no pdata supplied, so you will not have to patch the
driver all around checking each time if pdata is valid?
> Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
> ---
> pca953x.c | 21 +++++++++++----------
> 1 file changed, 11 insertions(+), 10 deletions(-)
> diff -Nur linux-3.0-rc5/drivers/gpio//pca953x.c
> linux-3.0-rc5__patched/drivers/gpio//pca953x.c
> --- linux-3.0-rc5/drivers/gpio//pca953x.c 2011-06-28 04:12:22.000000000 +0200
> +++ linux-3.0-rc5__patched/drivers/gpio//pca953x.c 2011-07-01
> 13:19:08.369130336 +0200
> @@ -452,7 +452,7 @@
> struct pca953x_platform_data *pdata = client->dev.platform_data;
> int ret, offset = 0;
>
> - if (pdata->irq_base != -1
> + if (pdata && pdata->irq_base != -1
> && (id->driver_data & PCA_INT)) {
> int lvl;
>
> @@ -524,7 +524,7 @@
> struct i2c_client *client = chip->client;
> struct pca953x_platform_data *pdata = client->dev.platform_data;
>
> - if (pdata->irq_base != -1 && (id->driver_data & PCA_INT))
> + if (pdata && pdata->irq_base != -1 && (id->driver_data & PCA_INT))
> dev_warn(&client->dev, "interrupt support not compiled in\n");
>
> return 0;
> @@ -643,6 +643,7 @@
> struct pca953x_platform_data *pdata;
> struct pca953x_chip *chip;
> int ret = 0;
> + int invert = 0;
>
> chip = kzalloc(sizeof(struct pca953x_chip), GFP_KERNEL);
> if (chip == NULL)
> @@ -660,15 +661,13 @@
>
> if (pdata == NULL) {
> dev_dbg(&client->dev, "no platform data\n");
> - ret = -EINVAL;
> - goto out_failed;
> }
>
> chip->client = client;
>
> - chip->gpio_start = pdata->gpio_base;
> + chip->gpio_start = pdata ? pdata->gpio_base : -1;
>
> - chip->names = pdata->names;
> + chip->names = pdata ? pdata->names : NULL;
> chip->chip_type = id->driver_data & (PCA953X_TYPE | PCA957X_TYPE);
>
> mutex_init(&chip->i2c_lock);
> @@ -678,10 +677,12 @@
> */
> pca953x_setup_gpio(chip, id->driver_data & PCA_GPIO_MASK);
>
> + invert = pdata ? pdata->invert : 0;
> +
> if (chip->chip_type == PCA953X_TYPE)
> - device_pca953x_init(chip, pdata->invert);
> + device_pca953x_init(chip, invert);
> else if (chip->chip_type == PCA957X_TYPE)
> - device_pca957x_init(chip, pdata->invert);
> + device_pca957x_init(chip, invert);
> else
> goto out_failed;
>
> @@ -693,7 +694,7 @@
> if (ret)
> goto out_failed_irq;
>
> - if (pdata->setup) {
> + if (pdata && pdata->setup) {
> ret = pdata->setup(client, chip->gpio_chip.base,
> chip->gpio_chip.ngpio, pdata->context);
> if (ret < 0)
> @@ -717,7 +718,7 @@
> struct pca953x_chip *chip = i2c_get_clientdata(client);
> int ret = 0;
>
> - if (pdata->teardown) {
> + if (pdata && pdata->teardown) {
> ret = pdata->teardown(client, chip->gpio_chip.base,
> chip->gpio_chip.ngpio, pdata->context);
> if (ret < 0) {
> ---
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
--
Regards,
Igor.
next prev parent reply other threads:[~2011-07-01 17:17 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-01 11:33 pca953x: support working w/o platform data Christian Gmeiner
2011-07-01 17:17 ` Igor Grinberg [this message]
2011-07-04 6:43 ` Grant Likely
2011-07-04 7:45 ` Igor Grinberg
2011-07-04 15:41 ` Grant Likely
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=4E0E0138.8060400@compulab.co.il \
--to=grinberg@compulab.co.il \
--cc=christian.gmeiner@gmail.com \
--cc=grant.likely@secretlab.ca \
--cc=linux-kernel@vger.kernel.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