* [PATCH] iio: ak8975: Fix issue with the name
@ 2014-04-29 15:44 Srinivas Pandruvada
2014-05-03 11:03 ` Jonathan Cameron
0 siblings, 1 reply; 2+ messages in thread
From: Srinivas Pandruvada @ 2014-04-29 15:44 UTC (permalink / raw)
To: jic23; +Cc: linux-iio, dan.carpenter, Srinivas Pandruvada
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
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] iio: ak8975: Fix issue with the name
2014-04-29 15:44 [PATCH] iio: ak8975: Fix issue with the name Srinivas Pandruvada
@ 2014-05-03 11:03 ` Jonathan Cameron
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2014-05-03 11:03 UTC (permalink / raw)
To: Srinivas Pandruvada; +Cc: linux-iio, dan.carpenter
On 29/04/14 16:44, Srinivas Pandruvada wrote:
> 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>
Applied to the togreg branch of iio.git
I amended the commit message to simply give a reported by credit rather than the
whole message above.
Thanks,
> ---
> 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);
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-05-03 11:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-04-29 15:44 [PATCH] iio: ak8975: Fix issue with the name Srinivas Pandruvada
2014-05-03 11:03 ` Jonathan Cameron
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).