i2c: mux: pca954x: merge calls to of_match_device and of_device_get_match_data
authorJulia Lawall <Julia.Lawall@lip6.fr>
Mon, 21 May 2018 09:49:08 +0000 (11:49 +0200)
committerPeter Rosin <peda@axentia.se>
Thu, 24 May 2018 11:51:25 +0000 (13:51 +0200)
commitb10d7a1fd6fcb16f242ffbd87bf0466b337708d6
tree9b020bb2c0eb843d59471f6b68c9094f0d9b2568
parent5a9dcd81908bb2bc6d8ed22bc4b7eec191024557
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>
drivers/i2c/muxes/i2c-mux-pca954x.c