Skip to contentSkip to conversation

iio: dac: ltc2688: Use temporary variable for struct device

PATCH Applied Andy Shevchenko 3 participants 3 messages Mar 2, 2022 – Mar 20, 2022

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iio: dac: ltc2688: Use temporary variable for struct device

Use temporary variable for struct device to make code neater.

---
 drivers/iio/dac/ltc2688.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/iio/dac/ltc2688.c +9 -10
index e41861d29767..d249fa28202c 100644
@@ -703,21 +703,20 @@ static int ltc2688_tgp_clk_setup(struct ltc2688_state *st,
 				 struct ltc2688_chan *chan,
 				 struct fwnode_handle *node, int tgp)
 {
+	struct device *dev = &st->spi->dev;
 	unsigned long rate;
 	struct clk *clk;
 	int ret, f;
 
-	clk = devm_get_clk_from_child(&st->spi->dev, to_of_node(node), NULL);
+	clk = devm_get_clk_from_child(dev, to_of_node(node), NULL);
 	if (IS_ERR(clk))
-		return dev_err_probe(&st->spi->dev, PTR_ERR(clk),
-				     "failed to get tgp clk.\n");
+		return dev_err_probe(dev, PTR_ERR(clk), "failed to get tgp clk.\n");
 
 	ret = clk_prepare_enable(clk);
 	if (ret)
-		return dev_err_probe(&st->spi->dev, ret,
-				     "failed to enable tgp clk.\n");
+		return dev_err_probe(dev, ret, "failed to enable tgp clk.\n");
 
-	ret = devm_add_action_or_reset(&st->spi->dev, ltc2688_clk_disable, clk);
+	ret = devm_add_action_or_reset(dev, ltc2688_clk_disable, clk);
 	if (ret)
 		return ret;
 
@@ -858,6 +857,7 @@ static int ltc2688_channel_config(struct ltc2688_state *st)
 
 static int ltc2688_setup(struct ltc2688_state *st, struct regulator *vref)
 {
+	struct device *dev = &st->spi->dev;
 	struct gpio_desc *gpio;
 	int ret;
 
@@ -865,10 +865,9 @@ static int ltc2688_setup(struct ltc2688_state *st, struct regulator *vref)
 	 * If we have a reset pin, use that to reset the board, If not, use
 	 * the reset bit.
 	 */
-	gpio = devm_gpiod_get_optional(&st->spi->dev, "clr", GPIOD_OUT_HIGH);
+	gpio = devm_gpiod_get_optional(dev, "clr", GPIOD_OUT_HIGH);
 	if (IS_ERR(gpio))
-		return dev_err_probe(&st->spi->dev, PTR_ERR(gpio),
-				     "Failed to get reset gpio");
+		return dev_err_probe(dev, PTR_ERR(gpio), "Failed to get reset gpio");
 	if (gpio) {
 		usleep_range(1000, 1200);
 		/* bring device out of reset */
@@ -887,7 +886,7 @@ static int ltc2688_setup(struct ltc2688_state *st, struct regulator *vref)
 	 * Duplicate the default channel configuration as it can change during
 	 * @ltc2688_channel_config()
 	 */
-	st->iio_chan = devm_kmemdup(&st->spi->dev, ltc2688_channels,
+	st->iio_chan = devm_kmemdup(dev, ltc2688_channels,
 				    sizeof(ltc2688_channels), GFP_KERNEL);
 	if (!st->iio_chan)
 		return -ENOMEM;
Signature · 1 line
2.34.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 11 lines

From: Andy Shevchenko <[email protected]>
Sent: Wednesday, March 2, 2022 4:32 PM
To: Sa, Nuno <[email protected]>; Andy Shevchenko <[email protected]>; [email protected]; [email protected]
Cc: Jonathan Cameron <[email protected]>; Lars-Peter Clausen <[email protected]>
Subject: [PATCH v1 1/1] iio: dac: ltc2688: Use temporary variable for struct device

Quoted 7 lines

[External]

Use temporary variable for struct device to make code neater.

Signed-off-by: Andy Shevchenko
<[email protected]>
---

Quoted 82 lines
 drivers/iio/dac/ltc2688.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/iio/dac/ltc2688.c +4 -6
index e41861d29767..d249fa28202c 100644
@@ -703,21 +703,20 @@ static int ltc2688_tgp_clk_setup(struct
 ltc2688_state *st,
 				 struct ltc2688_chan *chan,
 				 struct fwnode_handle *node, int tgp)
 {
+	struct device *dev = &st->spi->dev;
 	unsigned long rate;
 	struct clk *clk;
 	int ret, f;
 
-	clk = devm_get_clk_from_child(&st->spi->dev,
 to_of_node(node), NULL);
+	clk = devm_get_clk_from_child(dev, to_of_node(node),
 NULL);
 	if (IS_ERR(clk))
-		return dev_err_probe(&st->spi->dev, PTR_ERR(clk),
-				     "failed to get tgp clk.\n");
+		return dev_err_probe(dev, PTR_ERR(clk), "failed to get
 tgp clk.\n");
 
 	ret = clk_prepare_enable(clk);
 	if (ret)
-		return dev_err_probe(&st->spi->dev, ret,
-				     "failed to enable tgp clk.\n");
+		return dev_err_probe(dev, ret, "failed to enable tgp
 clk.\n");
 
-	ret = devm_add_action_or_reset(&st->spi->dev,

ltc2688_clk_disable, clk);

drivers/iio/dac/ltc2688.c +1 -0
+	ret = devm_add_action_or_reset(dev, ltc2688_clk_disable,

clk);

drivers/iio/dac/ltc2688.c +3 -3
 	if (ret)
 		return ret;
@@ -858,6 +857,7 @@ static int ltc2688_channel_config(struct
 ltc2688_state *st)
 
 static int ltc2688_setup(struct ltc2688_state *st, struct regulator *vref)
 {
+	struct device *dev = &st->spi->dev;
 	struct gpio_desc *gpio;
 	int ret;
@@ -865,10 +865,9 @@ static int ltc2688_setup(struct ltc2688_state
 *st, struct regulator *vref)
 	 * If we have a reset pin, use that to reset the board, If not, use
 	 * the reset bit.
 	 */
-	gpio = devm_gpiod_get_optional(&st->spi->dev, "clr",
 GPIOD_OUT_HIGH);
+	gpio = devm_gpiod_get_optional(dev, "clr",
 GPIOD_OUT_HIGH);
 	if (IS_ERR(gpio))
-		return dev_err_probe(&st->spi->dev, PTR_ERR(gpio),
-				     "Failed to get reset gpio");
+		return dev_err_probe(dev, PTR_ERR(gpio), "Failed to

get reset gpio");

drivers/iio/dac/ltc2688.c +0 -0
 	if (gpio) {
 		usleep_range(1000, 1200);
 		/* bring device out of reset */
@@ -887,7 +886,7 @@ static int ltc2688_setup(struct ltc2688_state *st,
 struct regulator *vref)
 	 * Duplicate the default channel configuration as it can change

during

drivers/iio/dac/ltc2688.c +0 -1
 	 * @ltc2688_channel_config()
 	 */
-	st->iio_chan = devm_kmemdup(&st->spi->dev,

ltc2688_channels,

drivers/iio/dac/ltc2688.c +1 -0
+	st->iio_chan = devm_kmemdup(dev, ltc2688_channels,
 				    sizeof(ltc2688_channels),

GFP_KERNEL);

drivers/iio/dac/ltc2688.c +0 -1
 	if (!st->iio_chan)
 		return -ENOMEM;
--

2.34.1

maintainer Applied
#2 lore raw
Quoted 12 lines · Nuno
Quoted 12 lines

From: Andy Shevchenko <[email protected]>
Sent: Wednesday, March 2, 2022 4:32 PM
To: Sa, Nuno <[email protected]>; Andy Shevchenko <[email protected]>; [email protected]; [email protected]
Cc: Jonathan Cameron <[email protected]>; Lars-Peter Clausen <[email protected]>
Subject: [PATCH v1 1/1] iio: dac: ltc2688: Use temporary variable for struct device

[External]

Quoted 7 lines
Quoted 5 lines

Use temporary variable for struct device to make code neater.

Signed-off-by: Andy Shevchenko
<[email protected]>
---

Applied to the togreg branch of iio.git but I'll be rebaseing that on rc1 so for now just pushed out as testing so 0-day can take a look at it.

Thanks,

Jonathan

Quoted 84 lines
Quoted 83 lines
 drivers/iio/dac/ltc2688.c | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)
drivers/iio/dac/ltc2688.c +4 -6
index e41861d29767..d249fa28202c 100644
@@ -703,21 +703,20 @@ static int ltc2688_tgp_clk_setup(struct
 ltc2688_state *st,
 				 struct ltc2688_chan *chan,
 				 struct fwnode_handle *node, int tgp)
 {
+	struct device *dev = &st->spi->dev;
 	unsigned long rate;
 	struct clk *clk;
 	int ret, f;
 
-	clk = devm_get_clk_from_child(&st->spi->dev,
 to_of_node(node), NULL);
+	clk = devm_get_clk_from_child(dev, to_of_node(node),
 NULL);
 	if (IS_ERR(clk))
-		return dev_err_probe(&st->spi->dev, PTR_ERR(clk),
-				     "failed to get tgp clk.\n");
+		return dev_err_probe(dev, PTR_ERR(clk), "failed to get
 tgp clk.\n");
 
 	ret = clk_prepare_enable(clk);
 	if (ret)
-		return dev_err_probe(&st->spi->dev, ret,
-				     "failed to enable tgp clk.\n");
+		return dev_err_probe(dev, ret, "failed to enable tgp
 clk.\n");
 
-	ret = devm_add_action_or_reset(&st->spi->dev,

ltc2688_clk_disable, clk);

drivers/iio/dac/ltc2688.c +1 -0
+	ret = devm_add_action_or_reset(dev, ltc2688_clk_disable,

clk);

drivers/iio/dac/ltc2688.c +3 -3
 	if (ret)
 		return ret;
@@ -858,6 +857,7 @@ static int ltc2688_channel_config(struct
 ltc2688_state *st)
 
 static int ltc2688_setup(struct ltc2688_state *st, struct regulator *vref)
 {
+	struct device *dev = &st->spi->dev;
 	struct gpio_desc *gpio;
 	int ret;
@@ -865,10 +865,9 @@ static int ltc2688_setup(struct ltc2688_state
 *st, struct regulator *vref)
 	 * If we have a reset pin, use that to reset the board, If not, use
 	 * the reset bit.
 	 */
-	gpio = devm_gpiod_get_optional(&st->spi->dev, "clr",
 GPIOD_OUT_HIGH);
+	gpio = devm_gpiod_get_optional(dev, "clr",
 GPIOD_OUT_HIGH);
 	if (IS_ERR(gpio))
-		return dev_err_probe(&st->spi->dev, PTR_ERR(gpio),
-				     "Failed to get reset gpio");
+		return dev_err_probe(dev, PTR_ERR(gpio), "Failed to

get reset gpio");

drivers/iio/dac/ltc2688.c +0 -0
 	if (gpio) {
 		usleep_range(1000, 1200);
 		/* bring device out of reset */
@@ -887,7 +886,7 @@ static int ltc2688_setup(struct ltc2688_state *st,
 struct regulator *vref)
 	 * Duplicate the default channel configuration as it can change

during

drivers/iio/dac/ltc2688.c +0 -1
 	 * @ltc2688_channel_config()
 	 */
-	st->iio_chan = devm_kmemdup(&st->spi->dev,

ltc2688_channels,

drivers/iio/dac/ltc2688.c +1 -0
+	st->iio_chan = devm_kmemdup(dev, ltc2688_channels,
 				    sizeof(ltc2688_channels),

GFP_KERNEL);

drivers/iio/dac/ltc2688.c +0 -1
 	if (!st->iio_chan)
 		return -ENOMEM;
--

2.34.1