Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 593702c7 authored by Shawn Guo's avatar Shawn Guo Committed by Ben Dooks
Browse files

i2c-imx: remove init/exit hooks from platform data 



The init/exit hooks in platform data are being used nowhere, so can
be removed.

Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Cc: Darius Augulis <augulis.darius@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Acked-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarBen Dooks <ben-linux@fluff.org>
parent 9e79e3e9

arch/arm/plat-mxc/include/mach/i2c.h

+0 −4
Original line number Diff line number Diff line
@@ -11,14 +11,10 @@ 


/**

 * struct imxi2c_platform_data - structure of platform data for MXC I2C driver

 * @init:	Initialise gpio's and other board specific things

 * @exit:	Free everything initialised by @init

 * @bitrate:	Bus speed measured in Hz

 *

 **/

struct imxi2c_platform_data {

	int (*init)(struct device *dev);

	void (*exit)(struct device *dev);

	int bitrate;

};

drivers/i2c/busses/i2c-imx.c

+3 −18
Original line number Diff line number Diff line
@@ -466,7 +466,7 @@ static int __init i2c_imx_probe(struct platform_device *pdev) 
{

	struct imx_i2c_struct *i2c_imx;

	struct resource *res;

	struct imxi2c_platform_data *pdata;

	struct imxi2c_platform_data *pdata = pdev->dev.platform_data;

	void __iomem *base;

	resource_size_t res_size;

	int irq;
@@ -485,19 +485,11 @@ static int __init i2c_imx_probe(struct platform_device *pdev) 
		return -ENOENT;

	}



	pdata = pdev->dev.platform_data;



	if (pdata && pdata->init) {

		ret = pdata->init(&pdev->dev);

		if (ret)

			return ret;

	}



	res_size = resource_size(res);



	if (!request_mem_region(res->start, res_size, DRIVER_NAME)) {

		ret = -EBUSY;

		goto fail0;

		dev_err(&pdev->dev, "request_mem_region failed\n");

		return -EBUSY;

	}



	base = ioremap(res->start, res_size);
@@ -586,9 +578,6 @@ static int __init i2c_imx_probe(struct platform_device *pdev) 
	iounmap(base);

fail1:

	release_mem_region(res->start, resource_size(res));

fail0:

	if (pdata && pdata->exit)

		pdata->exit(&pdev->dev);

	return ret; /* Return error number */

}
@@ -611,10 +600,6 @@ static int __exit i2c_imx_remove(struct platform_device *pdev) 
	writeb(0, i2c_imx->base + IMX_I2C_I2CR);

	writeb(0, i2c_imx->base + IMX_I2C_I2SR);



	/* Shut down hardware */

	if (pdata && pdata->exit)

		pdata->exit(&pdev->dev);



	clk_put(i2c_imx->clk);



	iounmap(i2c_imx->base);