Skip to contentSkip to conversation

i2c: use dev_get_platdata()

PATCH In review Jingoo Han 3 participants 4 messages Jul 30, 2013 – Aug 19, 2013

Subsystems (19)
PowerPC Arm i.MX and Layerscape Arm Samsung Exynos I2C subsystem host drivers +15 more subsystems
lore
Share & tools
lore

Jingoo Han

author
#0 lore raw

PATCH 5/35 i2c: use dev_get_platdata()

Use the wrapper function for retrieving the platform data instead of accessing dev->platform_data directly.

Signed-off-by Jingoo Han <[email protected]>
---
 drivers/i2c/busses/i2c-bfin-twi.c          |    9 +++++----
 drivers/i2c/busses/i2c-cbus-gpio.c         |    5 +++--
 drivers/i2c/busses/i2c-davinci.c           |    2 +-
 drivers/i2c/busses/i2c-gpio.c              |    6 +++---
 drivers/i2c/busses/i2c-imx.c               |    2 +-
 drivers/i2c/busses/i2c-mv64xxx.c           |    2 +-
 drivers/i2c/busses/i2c-nomadik.c           |    2 +-
 drivers/i2c/busses/i2c-nuc900.c            |    2 +-
 drivers/i2c/busses/i2c-ocores.c            |    2 +-
 drivers/i2c/busses/i2c-omap.c              |    2 +-
 drivers/i2c/busses/i2c-pca-platform.c      |    2 +-
 drivers/i2c/busses/i2c-powermac.c          |    2 +-
 drivers/i2c/busses/i2c-pxa.c               |    4 ++--
 drivers/i2c/busses/i2c-rcar.c              |    2 +-
 drivers/i2c/busses/i2c-s3c2410.c           |    2 +-
 drivers/i2c/busses/i2c-s6000.c             |    5 +++--
 drivers/i2c/busses/i2c-sh7760.c            |    2 +-
 drivers/i2c/busses/i2c-sh_mobile.c         |    2 +-
 drivers/i2c/busses/i2c-xiic.c              |    2 +-
 drivers/i2c/i2c-smbus.c                    |    2 +-
 drivers/i2c/muxes/i2c-arb-gpio-challenge.c |    2 +-
 drivers/i2c/muxes/i2c-mux-gpio.c           |    8 +++++---
 drivers/i2c/muxes/i2c-mux-pca9541.c        |    2 +-
 drivers/i2c/muxes/i2c-mux-pca954x.c        |    2 +-
 drivers/i2c/muxes/i2c-mux-pinctrl.c        |    2 +-
 25 files changed, 40 insertions(+), 35 deletions(-)
drivers/i2c/busses/i2c-bfin-twi.c +5 -4
index 13ea1c2..32b9a5e 100644
@@ -669,8 +669,9 @@ static int i2c_bfin_twi_probe(struct platform_device *pdev)
 	p_adap->timeout = 5 * HZ;
 	p_adap->retries = 3;
 
-	rc = peripheral_request_list((unsigned short *)pdev->dev.platform_data,
-					"i2c-bfin-twi");
+	rc = peripheral_request_list(
+			(unsigned short *)dev_get_platdata(&pdev->dev),
+			"i2c-bfin-twi");
 	if (rc) {
 		dev_err(&pdev->dev, "Can't setup pin mux!\n");
 		goto out_error_pin_mux;

@@ -717,7 +718,7 @@ out_error_add_adapter:
 	free_irq(iface->irq, iface);
 out_error_req_irq:
 out_error_no_irq:
-	peripheral_free_list((unsigned short *)pdev->dev.platform_data);
+	peripheral_free_list((unsigned short *)dev_get_platdata(&pdev->dev));
 out_error_pin_mux:
 	iounmap(iface->regs_base);
 out_error_ioremap:

@@ -733,7 +734,7 @@ static int i2c_bfin_twi_remove(struct platform_device *pdev)
 
 	i2c_del_adapter(&(iface->adap));
 	free_irq(iface->irq, iface);
-	peripheral_free_list((unsigned short *)pdev->dev.platform_data);
+	peripheral_free_list((unsigned short *)dev_get_platdata(&pdev->dev));
 	iounmap(iface->regs_base);
 	kfree(iface);
drivers/i2c/busses/i2c-cbus-gpio.c +3 -2
index 1be13ac..2d46f13 100644
@@ -233,8 +233,9 @@ static int cbus_i2c_probe(struct platform_device *pdev)
 		chost->clk_gpio = of_get_gpio(dnode, 0);
 		chost->dat_gpio = of_get_gpio(dnode, 1);
 		chost->sel_gpio = of_get_gpio(dnode, 2);
-	} else if (pdev->dev.platform_data) {
-		struct i2c_cbus_platform_data *pdata = pdev->dev.platform_data;
+	} else if (dev_get_platdata(&pdev->dev)) {
+		struct i2c_cbus_platform_data *pdata =
+			dev_get_platdata(&pdev->dev);
 		chost->clk_gpio = pdata->clk_gpio;
 		chost->dat_gpio = pdata->dat_gpio;
 		chost->sel_gpio = pdata->sel_gpio;
drivers/i2c/busses/i2c-davinci.c +1 -1
index fa55605..14c53cc 100644
@@ -665,7 +665,7 @@ static int davinci_i2c_probe(struct platform_device *pdev)
 #endif
 	dev->dev = &pdev->dev;
 	dev->irq = irq->start;
-	dev->pdata = dev->dev->platform_data;
+	dev->pdata = dev_get_platdata(&dev->dev);
 	platform_set_drvdata(pdev, dev);
 
 	if (!dev->pdata && pdev->dev.of_node) {
drivers/i2c/busses/i2c-gpio.c +3 -3
index bc6e139..8cdb4f7 100644
@@ -137,9 +137,9 @@ static int i2c_gpio_probe(struct platform_device *pdev)
 		if (ret)
 			return ret;
 	} else {
-		if (!pdev->dev.platform_data)
+		if (!dev_get_platdata(&pdev->dev))
 			return -ENXIO;
-		pdata = pdev->dev.platform_data;
+		pdata = dev_get_platdata(&pdev->dev);
 		sda_pin = pdata->sda_pin;
 		scl_pin = pdata->scl_pin;
 	}

@@ -171,7 +171,7 @@ static int i2c_gpio_probe(struct platform_device *pdev)
 		pdata->scl_pin = scl_pin;
 		of_i2c_gpio_get_props(pdev->dev.of_node, pdata);
 	} else {
-		memcpy(pdata, pdev->dev.platform_data, sizeof(*pdata));
+		memcpy(pdata, dev_get_platdata(&pdev->dev), sizeof(*pdata));
 	}
 
 	if (pdata->sda_is_open_drain) {
drivers/i2c/busses/i2c-imx.c +1 -1
index e242797..8bd1d4f 100644
@@ -492,7 +492,7 @@ static int __init i2c_imx_probe(struct platform_device *pdev)
 							   &pdev->dev);
 	struct imx_i2c_struct *i2c_imx;
 	struct resource *res;
-	struct imxi2c_platform_data *pdata = pdev->dev.platform_data;
+	struct imxi2c_platform_data *pdata = dev_get_platdata(&pdev->dev);
 	void __iomem *base;
 	int irq, ret;
 	u32 bitrate;
drivers/i2c/busses/i2c-mv64xxx.c +1 -1
index b1f42bf..9cc361d 100644
@@ -618,7 +618,7 @@ static int
 mv64xxx_i2c_probe(struct platform_device *pd)
 {
 	struct mv64xxx_i2c_data		*drv_data;
-	struct mv64xxx_i2c_pdata	*pdata = pd->dev.platform_data;
+	struct mv64xxx_i2c_pdata	*pdata = dev_get_platdata(&pd->dev);
 	struct resource	*r;
 	int	rc;
drivers/i2c/busses/i2c-nomadik.c +1 -1
index 512dfe6..1909e80 100644
@@ -943,7 +943,7 @@ static void nmk_i2c_of_probe(struct device_node *np,
 static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
 {
 	int ret = 0;
-	struct nmk_i2c_controller *pdata = adev->dev.platform_data;
+	struct nmk_i2c_controller *pdata = dev_get_platdata(&adev->dev);
 	struct device_node *np = adev->dev.of_node;
 	struct nmk_i2c_dev	*dev;
 	struct i2c_adapter *adap;
drivers/i2c/busses/i2c-nuc900.c +1 -1
index 865ee35..36394d7 100644
@@ -525,7 +525,7 @@ static int nuc900_i2c_probe(struct platform_device *pdev)
 	struct resource *res;
 	int ret;
 
-	pdata = pdev->dev.platform_data;
+	pdata = dev_get_platdata(&pdev->dev);
 	if (!pdata) {
 		dev_err(&pdev->dev, "no platform data\n");
 		return -EINVAL;
drivers/i2c/busses/i2c-ocores.c +1 -1
index 0e1f824..2899608 100644
@@ -369,7 +369,7 @@ static int ocores_i2c_probe(struct platform_device *pdev)
 	if (IS_ERR(i2c->base))
 		return PTR_ERR(i2c->base);
 
-	pdata = pdev->dev.platform_data;
+	pdata = dev_get_platdata(&pdev->dev);
 	if (pdata) {
 		i2c->reg_shift = pdata->reg_shift;
 		i2c->reg_io_width = pdata->reg_io_width;
drivers/i2c/busses/i2c-omap.c +1 -1
index 142b694d..49b3910 100644
@@ -1079,7 +1079,7 @@ omap_i2c_probe(struct platform_device *pdev)
 	struct i2c_adapter	*adap;
 	struct resource		*mem;
 	const struct omap_i2c_bus_platform_data *pdata =
-		pdev->dev.platform_data;
+		dev_get_platdata(&pdev->dev);
 	struct device_node	*node = pdev->dev.of_node;
 	const struct of_device_id *match;
 	int irq;
drivers/i2c/busses/i2c-pca-platform.c +1 -1
index aa00df1..39e2755 100644
@@ -136,7 +136,7 @@ static int i2c_pca_pf_probe(struct platform_device *pdev)
 	struct i2c_pca_pf_data *i2c;
 	struct resource *res;
 	struct i2c_pca9564_pf_platform_data *platform_data =
-				pdev->dev.platform_data;
+				dev_get_platdata(&pdev->dev);
 	int ret = 0;
 	int irq;
drivers/i2c/busses/i2c-powermac.c +1 -1
index 8dc90da..5a88364 100644
@@ -398,7 +398,7 @@ static void i2c_powermac_register_devices(struct i2c_adapter *adap,
 
 static int i2c_powermac_probe(struct platform_device *dev)
 {
-	struct pmac_i2c_bus *bus = dev->dev.platform_data;
+	struct pmac_i2c_bus *bus = dev_get_platdata(&dev->dev);
 	struct device_node *parent = NULL;
 	struct i2c_adapter *adapter;
 	const char *basename;
drivers/i2c/busses/i2c-pxa.c +2 -2
index fbafed2..a445d4f 100644
@@ -1072,7 +1072,7 @@ static int i2c_pxa_probe_pdata(struct platform_device *pdev,
 			       struct pxa_i2c *i2c,
 			       enum pxa_i2c_types *i2c_types)
 {
-	struct i2c_pxa_platform_data *plat = pdev->dev.platform_data;
+	struct i2c_pxa_platform_data *plat = dev_get_platdata(&pdev->dev);
 	const struct platform_device_id *id = platform_get_device_id(pdev);
 
 	*i2c_types = id->driver_data;

@@ -1085,7 +1085,7 @@ static int i2c_pxa_probe_pdata(struct platform_device *pdev,
 
 static int i2c_pxa_probe(struct platform_device *dev)
 {
-	struct i2c_pxa_platform_data *plat = dev->dev.platform_data;
+	struct i2c_pxa_platform_data *plat = dev_get_platdata(&dev->dev);
 	enum pxa_i2c_types i2c_type;
 	struct pxa_i2c *i2c;
 	struct resource *res = NULL;
drivers/i2c/busses/i2c-rcar.c +1 -1
index 0fc5858..e59c3f6 100644
@@ -615,7 +615,7 @@ static const struct i2c_algorithm rcar_i2c_algo = {
 
 static int rcar_i2c_probe(struct platform_device *pdev)
 {
-	struct i2c_rcar_platform_data *pdata = pdev->dev.platform_data;
+	struct i2c_rcar_platform_data *pdata = dev_get_platdata(&pdev->dev);
 	struct rcar_i2c_priv *priv;
 	struct i2c_adapter *adap;
 	struct resource *res;
drivers/i2c/busses/i2c-s3c2410.c +1 -1
index cab1c91..0a077b1 100644
@@ -1033,7 +1033,7 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
 	int ret;
 
 	if (!pdev->dev.of_node) {
-		pdata = pdev->dev.platform_data;
+		pdata = dev_get_platdata(&pdev->dev);
 		if (!pdata) {
 			dev_err(&pdev->dev, "no platform data\n");
 			return -EINVAL;
drivers/i2c/busses/i2c-s6000.c +3 -2
index 7c1ca5a..dd186a0 100644
@@ -290,8 +290,9 @@ static int s6i2c_probe(struct platform_device *dev)
 
 	clock = 0;
 	bus_num = -1;
-	if (dev->dev.platform_data) {
-		struct s6_i2c_platform_data *pdata = dev->dev.platform_data;
+	if (dev_get_platdata(&dev->dev)) {
+		struct s6_i2c_platform_data *pdata =
+			dev_get_platdata(&dev->dev);
 		bus_num = pdata->bus_num;
 		clock = pdata->clock;
 	}
drivers/i2c/busses/i2c-sh7760.c +1 -1
index 5351a2f..5e8f136 100644
@@ -437,7 +437,7 @@ static int sh7760_i2c_probe(struct platform_device *pdev)
 	struct cami2c *id;
 	int ret;
 
-	pd = pdev->dev.platform_data;
+	pd = dev_get_platdata(&pdev->dev);
 	if (!pd) {
 		dev_err(&pdev->dev, "no platform_data!\n");
 		ret = -ENODEV;
drivers/i2c/busses/i2c-sh_mobile.c +1 -1
index debf745..4e86a31 100644
@@ -658,7 +658,7 @@ static int sh_mobile_i2c_hook_irqs(struct platform_device *dev, int hook)
 
 static int sh_mobile_i2c_probe(struct platform_device *dev)
 {
-	struct i2c_sh_mobile_platform_data *pdata = dev->dev.platform_data;
+	struct i2c_sh_mobile_platform_data *pdata = dev_get_platdata(&dev->dev);
 	struct sh_mobile_i2c_data *pd;
 	struct i2c_adapter *adap;
 	struct resource *res;
drivers/i2c/busses/i2c-xiic.c +1 -1
index 3d0f052..433f377 100644
@@ -703,7 +703,7 @@ static int xiic_i2c_probe(struct platform_device *pdev)
 	if (irq < 0)
 		goto resource_missing;
 
-	pdata = (struct xiic_i2c_platform_data *) pdev->dev.platform_data;
+	pdata = (struct xiic_i2c_platform_data *)dev_get_platdata(&pdev->dev);
 
 	i2c = kzalloc(sizeof(*i2c), GFP_KERNEL);
 	if (!i2c)
drivers/i2c/i2c-smbus.c +1 -1
index 92cdd23..44d4c60 100644
@@ -137,7 +137,7 @@ static irqreturn_t smbalert_irq(int irq, void *d)
 static int smbalert_probe(struct i2c_client *ara,
 			  const struct i2c_device_id *id)
 {
-	struct i2c_smbus_alert_setup *setup = ara->dev.platform_data;
+	struct i2c_smbus_alert_setup *setup = dev_get_platdata(&ara->dev);
 	struct i2c_smbus_alert *alert;
 	struct i2c_adapter *adapter = ara->adapter;
 	int res;
drivers/i2c/muxes/i2c-arb-gpio-challenge.c +1 -1
index 210b6f7..f7bf243 100644
@@ -131,7 +131,7 @@ static int i2c_arbitrator_probe(struct platform_device *pdev)
 		dev_err(dev, "Cannot find device tree node\n");
 		return -ENODEV;
 	}
-	if (dev->platform_data) {
+	if (dev_get_platdata(dev)) {
 		dev_err(dev, "Platform data is not supported\n");
 		return -EINVAL;
 	}
drivers/i2c/muxes/i2c-mux-gpio.c +5 -3
index 5a0ce00..6a206e8 100644
@@ -148,12 +148,14 @@ static int i2c_mux_gpio_probe(struct platform_device *pdev)
 
 	platform_set_drvdata(pdev, mux);
 
-	if (!pdev->dev.platform_data) {
+	if (!dev_get_platdata(&pdev->dev)) {
 		ret = i2c_mux_gpio_probe_dt(mux, pdev);
 		if (ret < 0)
 			return ret;
-	} else
-		memcpy(&mux->data, pdev->dev.platform_data, sizeof(mux->data));
+	} else {
+		memcpy(&mux->data, dev_get_platdata(&pdev->dev),
+			sizeof(mux->data));
+	}
 
 	/*
 	 * If a GPIO chip name is provided, the GPIO pin numbers provided are
drivers/i2c/muxes/i2c-mux-pca9541.c +1 -1
index 966a18a..c4f08ad 100644
@@ -324,7 +324,7 @@ static int pca9541_probe(struct i2c_client *client,
 			 const struct i2c_device_id *id)
 {
 	struct i2c_adapter *adap = client->adapter;
-	struct pca954x_platform_data *pdata = client->dev.platform_data;
+	struct pca954x_platform_data *pdata = dev_get_platdata(&client->dev);
 	struct pca9541 *data;
 	int force;
 	int ret = -ENODEV;
drivers/i2c/muxes/i2c-mux-pca954x.c +1 -1
index a531d80..bad5b84 100644
@@ -185,7 +185,7 @@ static int pca954x_probe(struct i2c_client *client,
 			 const struct i2c_device_id *id)
 {
 	struct i2c_adapter *adap = to_i2c_adapter(client->dev.parent);
-	struct pca954x_platform_data *pdata = client->dev.platform_data;
+	struct pca954x_platform_data *pdata = dev_get_platdata(&client->dev);
 	int num, force, class;
 	struct pca954x *data;
 	int ret = -ENODEV;
drivers/i2c/muxes/i2c-mux-pinctrl.c +1 -1
index a43c0ce..0d08202 100644
@@ -145,7 +145,7 @@ static int i2c_mux_pinctrl_probe(struct platform_device *pdev)
 
 	mux->dev = &pdev->dev;
 
-	mux->pdata = pdev->dev.platform_data;
+	mux->pdata = dev_get_platdata(&pdev->dev);
 	if (!mux->pdata) {
 		ret = i2c_mux_pinctrl_parse_dt(mux, pdev);
 		if (ret < 0)
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 4 lines · Jingoo Han

Use the wrapper function for retrieving the platform data instead of accessing dev->platform_data directly.

Signed-off-by Jingoo Han <[email protected]>

Not convincing. I couldn't find a cover letter explaining the motivation and if this should go via the seperate trees or via one cleanup pull request. (and if there is one, the i2c list should be on cc) Also, all 35 patches seem to be seperate mails and not threaded, so I can't easily check other opinions. Will skip for now unless somebody points out a strong reason.

#2 lore raw
Quoted 9 lines · Wolfram Sang
Quoted 4 lines · Jingoo Han

Use the wrapper function for retrieving the platform data instead of accessing dev->platform_data directly.

Signed-off-by Jingoo Han <[email protected]>

Not convincing. I couldn't find a cover letter explaining the motivation and if this should go via the seperate trees or via one cleanup pull request. (and if there is one, the i2c list should be on cc) Also, all

CC'ed Mark Brown (author of dev_get_platdata function)

1. Motivation
This is a cosmetic change by in order to enhance readability and make the code simpler.

If you want, I will modify the commit message as below:
"Use the wrapper function for retrieving the platform data instead of
accessing dev->platform_data directly. This is a cosmetic change in order to enhance readability and make the code simpler."

2. via the separate trees
It should go via the separate trees.

Quoted 3 lines

35 patches seem to be seperate mails and not threaded, so I can't easily check other opinions. Will skip for now unless somebody points out a strong reason.

3. Other opinions
Until now, there is no objection.
Also, 21 patches of all 35 patches have been applied by each maintainer.

Mark Brown,
Sorry for CC'ing you.
If I am wrong, please let me know kindly. :)

Best regards,
Jingoo Han