Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: Shawn Guo <shawn.guo@linaro.org>
Cc: Darius Augulis <augulis.darius@gmail.com>
Cc: Ben Dooks <ben-linux@fluff.org>
Acked-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Ben Dooks <ben-linux@fluff.org>

authored by

Shawn Guo and committed by
Ben Dooks
593702c7 9e79e3e9

+3 -22
-4
arch/arm/plat-mxc/include/mach/i2c.h
··· 11 11 12 12 /** 13 13 * struct imxi2c_platform_data - structure of platform data for MXC I2C driver 14 - * @init: Initialise gpio's and other board specific things 15 - * @exit: Free everything initialised by @init 16 14 * @bitrate: Bus speed measured in Hz 17 15 * 18 16 **/ 19 17 struct imxi2c_platform_data { 20 - int (*init)(struct device *dev); 21 - void (*exit)(struct device *dev); 22 18 int bitrate; 23 19 }; 24 20
+3 -18
drivers/i2c/busses/i2c-imx.c
··· 466 466 { 467 467 struct imx_i2c_struct *i2c_imx; 468 468 struct resource *res; 469 - struct imxi2c_platform_data *pdata; 469 + struct imxi2c_platform_data *pdata = pdev->dev.platform_data; 470 470 void __iomem *base; 471 471 resource_size_t res_size; 472 472 int irq; ··· 485 485 return -ENOENT; 486 486 } 487 487 488 - pdata = pdev->dev.platform_data; 489 - 490 - if (pdata && pdata->init) { 491 - ret = pdata->init(&pdev->dev); 492 - if (ret) 493 - return ret; 494 - } 495 - 496 488 res_size = resource_size(res); 497 489 498 490 if (!request_mem_region(res->start, res_size, DRIVER_NAME)) { 499 - ret = -EBUSY; 500 - goto fail0; 491 + dev_err(&pdev->dev, "request_mem_region failed\n"); 492 + return -EBUSY; 501 493 } 502 494 503 495 base = ioremap(res->start, res_size); ··· 578 586 iounmap(base); 579 587 fail1: 580 588 release_mem_region(res->start, resource_size(res)); 581 - fail0: 582 - if (pdata && pdata->exit) 583 - pdata->exit(&pdev->dev); 584 589 return ret; /* Return error number */ 585 590 } 586 591 ··· 599 610 writeb(0, i2c_imx->base + IMX_I2C_IFDR); 600 611 writeb(0, i2c_imx->base + IMX_I2C_I2CR); 601 612 writeb(0, i2c_imx->base + IMX_I2C_I2SR); 602 - 603 - /* Shut down hardware */ 604 - if (pdata && pdata->exit) 605 - pdata->exit(&pdev->dev); 606 613 607 614 clk_put(i2c_imx->clk); 608 615