Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1332492
| From | Chen-Yu Tsai <wens@csie.org> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v8 02/10] mfd: axp20x: Remove second struct device * parameter for axp20x_match_device() |
| Date | 2016-02-12 03:10 +0100 |
| Message-ID | <r1bli-wq-23@gated-at.bofh.it> (permalink) |
| References | <r1blh-wq-11@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
The first argument passed to axp20x_match_device(), struct axp20x_dev *,
already contains a pointer to the device. By rearranging some code,
moving the assignment of the pointer before axp20x_match_device() is
called, we can eliminate the second parameter.
Suggested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
---
drivers/mfd/axp20x.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index 9842199e2e6c..685a78614f83 100644
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -606,8 +606,9 @@ static void axp20x_power_off(void)
AXP20X_OFF);
}
-static int axp20x_match_device(struct axp20x_dev *axp20x, struct device *dev)
+static int axp20x_match_device(struct axp20x_dev *axp20x)
{
+ struct device *dev = axp20x->dev;
const struct acpi_device_id *acpi_id;
const struct of_device_id *of_id;
@@ -673,14 +674,14 @@ static int axp20x_i2c_probe(struct i2c_client *i2c,
if (!axp20x)
return -ENOMEM;
- ret = axp20x_match_device(axp20x, &i2c->dev);
- if (ret)
- return ret;
-
axp20x->i2c_client = i2c;
axp20x->dev = &i2c->dev;
dev_set_drvdata(axp20x->dev, axp20x);
+ ret = axp20x_match_device(axp20x);
+ if (ret)
+ return ret;
+
axp20x->regmap = devm_regmap_init_i2c(i2c, axp20x->regmap_cfg);
if (IS_ERR(axp20x->regmap)) {
ret = PTR_ERR(axp20x->regmap);
--
2.7.0
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v8 00/10] mfd: axp20x: Add support for RSB based AXP223 Chen-Yu Tsai <wens@csie.org> - 2016-02-12 03:10 +0100 [PATCH v8 04/10] mfd: axp20x: Add missing copyright notice Chen-Yu Tsai <wens@csie.org> - 2016-02-12 03:10 +0100 [PATCH v8 01/10] mfd: axp20x: Add AXP223 to list of supported PMICs in DT bindings Chen-Yu Tsai <wens@csie.org> - 2016-02-12 03:10 +0100 [PATCH v8 06/10] mfd: axp20x: Whitespace, open parenthesis alignment code style fixes Chen-Yu Tsai <wens@csie.org> - 2016-02-12 03:10 +0100 [PATCH v8 05/10] mfd: axp20x: Split the driver into core and i2c bits Chen-Yu Tsai <wens@csie.org> - 2016-02-12 03:10 +0100 [PATCH v8 02/10] mfd: axp20x: Remove second struct device * parameter for axp20x_match_device() Chen-Yu Tsai <wens@csie.org> - 2016-02-12 03:10 +0100 [PATCH v8 08/10] regulator: axp20x: Support new AXP223 PMIC Chen-Yu Tsai <wens@csie.org> - 2016-02-12 03:10 +0100 [PATCH v8 09/10] ARM: dts: sun8i: sinlinx-sina33: Add AXP223 PMIC device and regulator nodes Chen-Yu Tsai <wens@csie.org> - 2016-02-12 03:10 +0100 [PATCH v8 07/10] mfd: axp20x: Add support for RSB based AXP223 PMIC Chen-Yu Tsai <wens@csie.org> - 2016-02-12 03:10 +0100 [PATCH v8 03/10] mfd: axp20x: use dev->driver->of_match_table in axp20x_match_device() Chen-Yu Tsai <wens@csie.org> - 2016-02-12 03:10 +0100 [GIT PULL] Immutable branch between MFD and Regulator Lee Jones <lee.jones@linaro.org> - 2016-02-12 10:10 +0100 Re: [PATCH v8 00/10] mfd: axp20x: Add support for RSB based AXP223 Lee Jones <lee.jones@linaro.org> - 2016-02-12 10:10 +0100 Re: [PATCH v8 00/10] mfd: axp20x: Add support for RSB based AXP223 Maxime Ripard <maxime.ripard@free-electrons.com> - 2016-02-16 09:10 +0100
csiph-web