i2c: mux: pca954x: use helper variable in probe

This creates a struct device *dev helper variable in probe()
which IMO makes the code less cluttered and easier to read.
Also rename the of_node veriable to the common shortform "np"
(node pointer).

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
[peda: slightly edited commit message and removed some surplus newlines]
Signed-off-by: Peter Rosin <peda@axentia.se>

diff --git a/drivers/i2c/muxes/i2c-mux-pca954x.c b/drivers/i2c/muxes/i2c-mux-pca954x.c
index fbc748027087dbfd9783a459ccc74a7834d1a480..91e22d25718618457b5b9df6c145618cd3fb1572 100644 (file)
--- a/drivers/i2c/muxes/i2c-mux-pca954x.c
+++ b/drivers/i2c/muxes/i2c-mux-pca954x.c
@@ -368,7 +368,8 @@ static int pca954x_probe(struct i2c_client *client,
 {
        struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
        struct pca954x_platform_data *pdata = dev_get_platdata(&client->dev);
-       struct device_node *of_node = client->dev.of_node;
+       struct device *dev = &client->dev;
+       struct device_node *np = dev->of_node;
        bool idle_disconnect_dt;
        struct gpio_desc *gpio;
        int num, force, class;
@@ -379,8 +380,7 @@ static int pca954x_probe(struct i2c_client *client,
        if (!i2c_check_functionality(adap, I2C_FUNC_SMBUS_BYTE))
                return -ENODEV;
 
-       muxc = i2c_mux_alloc(adap, &client->dev,
-                            PCA954X_MAX_NCHANS, sizeof(*data), 0,
+       muxc = i2c_mux_alloc(adap, dev, PCA954X_MAX_NCHANS, sizeof(*data), 0,
                             pca954x_select_chan, pca954x_deselect_mux);
        if (!muxc)
                return -ENOMEM;
@@ -390,7 +390,7 @@ static int pca954x_probe(struct i2c_client *client,
        data->client = client;
 
        /* Reset the mux if a reset GPIO is specified. */
-       gpio = devm_gpiod_get_optional(&client->dev, "reset", GPIOD_OUT_HIGH);
+       gpio = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_HIGH);
        if (IS_ERR(gpio))
                return PTR_ERR(gpio);
        if (gpio) {
@@ -400,7 +400,7 @@ static int pca954x_probe(struct i2c_client *client,
                udelay(1);
        }
 
-       data->chip = of_device_get_match_data(&client->dev);
+       data->chip = of_device_get_match_data(dev);
        if (!data->chip)
                data->chip = &chips[id->driver_data];
 
@@ -414,8 +414,7 @@ static int pca954x_probe(struct i2c_client *client,
                if (!ret &&
                    (id.manufacturer_id != data->chip->id.manufacturer_id ||
                     id.part_id != data->chip->id.part_id)) {
-                       dev_warn(&client->dev,
-                                "unexpected device id %03x-%03x-%x\n",
+                       dev_warn(dev, "unexpected device id %03x-%03x-%x\n",
                                 id.manufacturer_id, id.part_id,
                                 id.die_revision);
                        return -ENODEV;
@@ -427,14 +426,14 @@ static int pca954x_probe(struct i2c_client *client,
         * initializes the mux to disconnected state.
         */
        if (i2c_smbus_write_byte(client, 0) < 0) {
-               dev_warn(&client->dev, "probe failed\n");
+               dev_warn(dev, "probe failed\n");
                return -ENODEV;
        }
 
        data->last_chan = 0;               /* force the first selection */
 
-       idle_disconnect_dt = of_node &&
-               of_property_read_bool(of_node, "i2c-mux-idle-disconnect");
+       idle_disconnect_dt = np &&
+               of_property_read_bool(np, "i2c-mux-idle-disconnect");
 
        ret = pca954x_irq_setup(muxc);
        if (ret)
@@ -465,7 +464,7 @@ static int pca954x_probe(struct i2c_client *client,
        }
 
        if (data->irq) {
-               ret = devm_request_threaded_irq(&client->dev, data->client->irq,
+               ret = devm_request_threaded_irq(dev, data->client->irq,
                                                NULL, pca954x_irq_handler,
                                                IRQF_ONESHOT | IRQF_SHARED,
                                                "pca954x", data);
@@ -473,8 +472,7 @@ static int pca954x_probe(struct i2c_client *client,
                        goto fail_cleanup;
        }
 
-       dev_info(&client->dev,
-                "registered %d multiplexed busses for I2C %s %s\n",
+       dev_info(dev, "registered %d multiplexed busses for I2C %s %s\n",
                 num, data->chip->muxtype == pca954x_ismux
                                ? "mux" : "switch", client->name);