Commit b10d7a1f authored May 21, 2018 by Julia Lawall Committed by Peter Rosin May 24, 2018

i2c: mux: pca954x: 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: Peter Rosin <peda@axentia.se>

parent 5a9dcd81

drivers/i2c/muxes/i2c-mux-pca954x.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -374,7 +374,6 @@ static int pca954x_probe(struct i2c_client *client,
		int num, force, class;
		struct i2c_mux_core *muxc;
		struct pca954x *data;
		const struct of_device_id *match;
		int ret;

		if (!i2c_check_functionality(adap, I2C_FUNC_SMBUS_BYTE))
		@@ -401,10 +400,8 @@ static int pca954x_probe(struct i2c_client *client,
		udelay(1);
		}

		match = of_match_device(of_match_ptr(pca954x_of_match), &client->dev);
		if (match)
		data->chip = of_device_get_match_data(&client->dev);
		else
		if (!data->chip)
		data->chip = &chips[id->driver_data];

		if (data->chip->id.manufacturer_id != I2C_DEVICE_ID_NONE) {

Admin message