| Message ID | 20191004214334.149976-10-swboyd@chromium.org (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | Stop NULLifying match pointer in of_match_device() | expand |
On Fri, Oct 04, 2019 at 02:43:33PM -0700, Stephen Boyd wrote: > We're going to remove of_match_ptr() from the definition of > of_match_device() when CONFIG_OF=n. This way we can always be certain > that of_match_device() acts the same when CONFIG_OF is set and when it > isn't. Add of_match_ptr() here so that this doesn't break when that > change is made to the of_match_device() API. > > Cc: Arnd Bergmann <arnd@arndb.de> > Cc: Geert Uytterhoeven <geert@linux-m68k.org> > Cc: Jean Delvare <jdelvare@suse.com> > Cc: Guenter Roeck <linux@roeck-us.net> > Cc: Rob Herring <robh+dt@kernel.org> > Cc: Frank Rowand <frowand.list@gmail.com> > Cc: <linux-hwmon@vger.kernel.org> > Signed-off-by: Stephen Boyd <swboyd@chromium.org> Acked-by: Guenter Roeck <linux@roeck-us.net> > --- > > Please ack or pick for immediate merge so the last patch can be merged. > > drivers/hwmon/lm70.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/hwmon/lm70.c b/drivers/hwmon/lm70.c > index 4122e59f0bb4..57480dada955 100644 > --- a/drivers/hwmon/lm70.c > +++ b/drivers/hwmon/lm70.c > @@ -155,7 +155,7 @@ static int lm70_probe(struct spi_device *spi) > struct lm70 *p_lm70; > int chip; > > - match = of_match_device(lm70_of_ids, &spi->dev); > + match = of_match_device(of_match_ptr(lm70_of_ids), &spi->dev); > if (match) > chip = (int)(uintptr_t)match->data; > else > -- > Sent by a computer through tubes >
diff --git a/drivers/hwmon/lm70.c b/drivers/hwmon/lm70.c index 4122e59f0bb4..57480dada955 100644 --- a/drivers/hwmon/lm70.c +++ b/drivers/hwmon/lm70.c @@ -155,7 +155,7 @@ static int lm70_probe(struct spi_device *spi) struct lm70 *p_lm70; int chip; - match = of_match_device(lm70_of_ids, &spi->dev); + match = of_match_device(of_match_ptr(lm70_of_ids), &spi->dev); if (match) chip = (int)(uintptr_t)match->data; else
We're going to remove of_match_ptr() from the definition of of_match_device() when CONFIG_OF=n. This way we can always be certain that of_match_device() acts the same when CONFIG_OF is set and when it isn't. Add of_match_ptr() here so that this doesn't break when that change is made to the of_match_device() API. Cc: Arnd Bergmann <arnd@arndb.de> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Jean Delvare <jdelvare@suse.com> Cc: Guenter Roeck <linux@roeck-us.net> Cc: Rob Herring <robh+dt@kernel.org> Cc: Frank Rowand <frowand.list@gmail.com> Cc: <linux-hwmon@vger.kernel.org> Signed-off-by: Stephen Boyd <swboyd@chromium.org> --- Please ack or pick for immediate merge so the last patch can be merged. drivers/hwmon/lm70.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)