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.

Found by coccinelle.

Signed-off-by: YueHaibing <yuehaib...@huawei.com>
---
 drivers/iio/potentiometer/mcp4018.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/iio/potentiometer/mcp4018.c 
b/drivers/iio/potentiometer/mcp4018.c
index 320a7c9..c051ee0 100644
--- a/drivers/iio/potentiometer/mcp4018.c
+++ b/drivers/iio/potentiometer/mcp4018.c
@@ -147,7 +147,6 @@ static int mcp4018_probe(struct i2c_client *client)
        struct device *dev = &client->dev;
        struct mcp4018_data *data;
        struct iio_dev *indio_dev;
-       const struct of_device_id *match;
 
        if (!i2c_check_functionality(client->adapter,
                                     I2C_FUNC_SMBUS_BYTE)) {
@@ -162,10 +161,8 @@ static int mcp4018_probe(struct i2c_client *client)
        i2c_set_clientdata(client, indio_dev);
        data->client = client;
 
-       match = of_match_device(of_match_ptr(mcp4018_of_match), dev);
-       if (match)
-               data->cfg = of_device_get_match_data(dev);
-       else
+       data->cfg = of_device_get_match_data(dev);
+       if (!data->cfg)
                data->cfg = &mcp4018_cfg[i2c_match_id(mcp4018_id, 
client)->driver_data];
 
        indio_dev->dev.parent = dev;
-- 
1.8.3.1


Reply via email to