Commit 794ac821 authored May 21, 2018 by Julia Lawall Committed by Jonathan Cameron Jul 08, 2018

iio: adc: max1363: merge calls to of_match_device and of_device_get_match_data

Drop call to of_match_device, which is subsumed by the subsequent
call to of_device_get_match_data.  The code becomes simpler, and a
temporary variable can be dropped.

The semantic match that makes this change is as follows:
(http://coccinelle.lip6.fr/

)

// <smpl>
@r@
local idexpression match;
identifier i;
expression x, dev, e, e1;
@@
-        match@i = of_match_device(x, dev);
-        if (match) e = of_device_get_match_data(dev);
-        else e = e1;
+        e = of_device_get_match_data(dev);
+        if (!e) e = e1;

@@
identifier r.i;
@@
- const struct of_device_id *i;
... when != i
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>

parent 777baca0

drivers/iio/adc/max1363.c

+2 −6

Original line number	Diff line number	Diff line
		@@ -1577,7 +1577,6 @@ static int max1363_probe(struct i2c_client *client,
		struct max1363_state *st;
		struct iio_dev *indio_dev;
		struct regulator *vref;
		const struct of_device_id *match;

		indio_dev = devm_iio_device_alloc(&client->dev,
		sizeof(struct max1363_state));
		@@ -1604,11 +1603,8 @@ static int max1363_probe(struct i2c_client *client,
		/* this is only used for device removal purposes */
		i2c_set_clientdata(client, indio_dev);

		match = of_match_device(of_match_ptr(max1363_of_match),
		&client->dev);
		if (match)
		st->chip_info = of_device_get_match_data(&client->dev);
		else
		if (!st->chip_info)
		st->chip_info = &max1363_chip_info_tbl[id->driver_data];
		st->client = client;