From: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
To: jic23@kernel.org
Cc: linux-iio@vger.kernel.org, dan.carpenter@oracle.com,
Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Subject: [PATCH] iio: ak8975: Fix issue with the name
Date: Tue, 29 Apr 2014 08:44:34 -0700 [thread overview]
Message-ID: <1398786274-24868-1-git-send-email-srinivas.pandruvada@linux.intel.com> (raw)
Fixing issue caused by clash of two patches, one adding a name with
the acpi enumeration patch.
54ab3e24 Beomho Seo 2014-04-02 @572 indio_dev->name = id->name;
d913971e Srinivas Pandruvada 2014-03-19 574 indio_dev->name = name;
The name added by commit 54ab3e24 is not required as this is already
added by taking care of case where id is NULL.
Datailed warning 0-DAY kernel build testing backend:
vers/iio/magnetometer/ak8975.c:572 ak8975_probe() error: we previously assumed 'id' could be null (see line 546)
git remote add iio git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git
git remote update iio
git checkout d913971ecaf31d7d5a6836224b669e1972469445
vim +/id +572 drivers/iio/magnetometer/ak8975.c
94a6d5cf drivers/iio/magnetometer/ak8975.c Jacek Anaszewski 2013-05-07 540
94a6d5cf drivers/iio/magnetometer/ak8975.c Jacek Anaszewski 2013-05-07 541 data->client = client;
94a6d5cf drivers/iio/magnetometer/ak8975.c Jacek Anaszewski 2013-05-07 542 data->eoc_gpio = eoc_gpio;
94a6d5cf drivers/iio/magnetometer/ak8975.c Jacek Anaszewski 2013-05-07 543 data->eoc_irq = 0;
94a6d5cf drivers/iio/magnetometer/ak8975.c Jacek Anaszewski 2013-05-07 544
d913971e drivers/iio/magnetometer/ak8975.c Srinivas Pandruvada 2014-03-19 545 /* id will be NULL when enumerated via ACPI */
d913971e drivers/iio/magnetometer/ak8975.c Srinivas Pandruvada 2014-03-19 @546 if (id) {
d913971e drivers/iio/magnetometer/ak8975.c Srinivas Pandruvada 2014-03-19 547 data->chipset =
d913971e drivers/iio/magnetometer/ak8975.c Srinivas Pandruvada 2014-03-19 548 (enum asahi_compass_chipset)(id->driver_data);
d913971e drivers/iio/magnetometer/ak8975.c Srinivas Pandruvada 2014-03-19 549 name = (char *) id->name;
d913971e drivers/iio/magnetometer/ak8975.c Srinivas Pandruvada 2014-03-19 550 } else if (ACPI_HANDLE(&client->dev))
d913971e drivers/iio/magnetometer/ak8975.c Srinivas Pandruvada 2014-03-19 551 name = ak8975_match_acpi_device(&client->dev, &data->chipset);
d913971e drivers/iio/magnetometer/ak8975.c Srinivas Pandruvada 2014-03-19 552 else {
d913971e drivers/iio/magnetometer/ak8975.c Srinivas Pandruvada 2014-03-19 553 err = -ENOSYS;
d913971e drivers/iio/magnetometer/ak8975.c Srinivas Pandruvada 2014-03-19 554 goto exit_free_iio;
d913971e drivers/iio/magnetometer/ak8975.c Srinivas Pandruvada 2014-03-19 555 }
d913971e drivers/iio/magnetometer/ak8975.c Srinivas Pandruvada 2014-03-19 556 dev_dbg(&client->dev, "Asahi compass chip %s\n", name);
6027c077 drivers/iio/magnetometer/ak8975.c Srinivas Pandruvada 2014-03-19 557
3285aae1 drivers/staging/iio/magnetometer/ak8975.c Andrew Chew 2010-09-08 558 /* Perform some basic start-of-day setup of the device. */
3285aae1 drivers/staging/iio/magnetometer/ak8975.c Andrew Chew 2010-09-08 559 err = ak8975_setup(client);
3285aae1 drivers/staging/iio/magnetometer/ak8975.c Andrew Chew 2010-09-08 560 if (err < 0) {
3285aae1 drivers/staging/iio/magnetometer/ak8975.c Andrew Chew 2010-09-08 561 dev_err(&client->dev, "AK8975 initialization fails\n");
ad31d250 drivers/staging/iio/magnetometer/ak8975.c Stephen Warren 2011-09-21 562 goto exit_free_iio;
3285aae1 drivers/staging/iio/magnetometer/ak8975.c Andrew Chew 2010-09-08 563 }
3285aae1 drivers/staging/iio/magnetometer/ak8975.c Andrew Chew 2010-09-08 564
338473c8 drivers/staging/iio/magnetometer/ak8975.c Jonathan Cameron 2011-06-27 565 data->client = client;
338473c8 drivers/staging/iio/magnetometer/ak8975.c Jonathan Cameron 2011-06-27 566 mutex_init(&data->lock);
338473c8 drivers/staging/iio/magnetometer/ak8975.c Jonathan Cameron 2011-06-27 567 data->eoc_gpio = eoc_gpio;
338473c8 drivers/staging/iio/magnetometer/ak8975.c Jonathan Cameron 2011-06-27 568 indio_dev->dev.parent = &client->dev;
694e1b5f drivers/staging/iio/magnetometer/ak8975.c Jonathan Cameron 2011-08-12 569 indio_dev->channels = ak8975_channels;
694e1b5f drivers/staging/iio/magnetometer/ak8975.c Jonathan Cameron 2011-08-12 570 indio_dev->num_channels = ARRAY_SIZE(ak8975_channels);
338473c8 drivers/staging/iio/magnetometer/ak8975.c Jonathan Cameron 2011-06-27 571 indio_dev->info = &ak8975_info;
54ab3e24 drivers/iio/magnetometer/ak8975.c Beomho Seo 2014-04-02 @572 indio_dev->name = id->name;
338473c8 drivers/staging/iio/magnetometer/ak8975.c Jonathan Cameron 2011-06-27 573 indio_dev->modes = INDIO_DIRECT_MODE;
d913971e drivers/iio/magnetometer/ak8975.c Srinivas Pandruvada 2014-03-19 574 indio_dev->name = name;
338473c8 drivers/staging/iio/magnetometer/ak8975.c Jonathan Cameron 2011-06-27 575 err = iio_device_register(indio_dev);
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
drivers/iio/magnetometer/ak8975.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/drivers/iio/magnetometer/ak8975.c b/drivers/iio/magnetometer/ak8975.c
index f5c1d41..09ea5c4 100644
--- a/drivers/iio/magnetometer/ak8975.c
+++ b/drivers/iio/magnetometer/ak8975.c
@@ -569,7 +569,6 @@ static int ak8975_probe(struct i2c_client *client,
indio_dev->channels = ak8975_channels;
indio_dev->num_channels = ARRAY_SIZE(ak8975_channels);
indio_dev->info = &ak8975_info;
- indio_dev->name = id->name;
indio_dev->modes = INDIO_DIRECT_MODE;
indio_dev->name = name;
err = iio_device_register(indio_dev);
--
1.7.11.7
next reply other threads:[~2014-04-29 15:56 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-29 15:44 Srinivas Pandruvada [this message]
2014-05-03 11:03 ` [PATCH] iio: ak8975: Fix issue with the name Jonathan Cameron
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=1398786274-24868-1-git-send-email-srinivas.pandruvada@linux.intel.com \
--to=srinivas.pandruvada@linux.intel.com \
--cc=dan.carpenter@oracle.com \
--cc=jic23@kernel.org \
--cc=linux-iio@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;
as well as URLs for NNTP newsgroup(s).