1 files changed, 2 insertions, 5 deletions

diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
index fe20b8ec5247..fbc748027087 100644
--- a/drivers/i2c/muxes/i2c-mux-pca954x.c
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
@@ -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
+        data->chip = of_device_get_match_data(&client->dev);
+        if (!data->chip)
                 data->chip = &chips[id->driver_data];
 
         if (data->chip->id.manufacturer_id != I2C_DEVICE_ID_NONE) {