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

mmc: tmio-mmc: Remove .set_pwr() callback from platform data

The .set_pwr() callback isn't used anymore as all platforms register
GPIO-controlled regulators. Remove it.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>

authored by

Laurent Pinchart and committed by
Chris Ball
3af9d15c 2b63b341

-9
-1
drivers/mmc/host/tmio_mmc.h
··· 68 68 enum tmio_mmc_power power; 69 69 70 70 /* Callbacks for clock / power control */ 71 - void (*set_pwr)(struct platform_device *host, int state); 72 71 void (*set_clk_div)(struct platform_device *host, int state); 73 72 74 73 /* pio related stuff */
-7
drivers/mmc/host/tmio_mmc_pio.c
··· 777 777 778 778 /* .set_ios() is returning void, so, no chance to report an error */ 779 779 780 - if (host->set_pwr) 781 - host->set_pwr(host->pdev, 1); 782 - 783 780 if (!IS_ERR(mmc->supply.vmmc)) { 784 781 ret = mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd); 785 782 /* ··· 810 813 811 814 if (!IS_ERR(mmc->supply.vmmc)) 812 815 mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, 0); 813 - 814 - if (host->set_pwr) 815 - host->set_pwr(host->pdev, 0); 816 816 } 817 817 818 818 /* Set MMC clock / power. ··· 996 1002 _host->pdev = pdev; 997 1003 platform_set_drvdata(pdev, mmc); 998 1004 999 - _host->set_pwr = pdata->set_pwr; 1000 1005 _host->set_clk_div = pdata->set_clk_div; 1001 1006 1002 1007 /* SD control register space size is 0x200, 0x400 for bus_shift=1 */
-1
include/linux/mfd/tmio.h
··· 106 106 struct tmio_mmc_dma *dma; 107 107 struct device *dev; 108 108 unsigned int cd_gpio; 109 - void (*set_pwr)(struct platform_device *host, int state); 110 109 void (*set_clk_div)(struct platform_device *host, int state); 111 110 int (*write16_hook)(struct tmio_mmc_host *host, int addr); 112 111 /* clock management callbacks */