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

Commit 57fcb523 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Chris Ball
Browse files

mmc: sh_mobile_sdhi: Remove .get_cd() callback from platform data 



All platforms pass the CD GPIO number to the driver in the .cd_gpio
field. The .get_cd() callback isn't used anymore, remove it.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 83a0c779

drivers/mmc/host/sh_mobile_sdhi.c

+0 −9
Original line number Diff line number Diff line
@@ -77,13 +77,6 @@ static void sh_mobile_sdhi_set_pwr(struct platform_device *pdev, int state) 
	p->set_pwr(pdev, state);

}



static int sh_mobile_sdhi_get_cd(struct platform_device *pdev)

{

	struct sh_mobile_sdhi_info *p = pdev->dev.platform_data;



	return p->get_cd(pdev);

}



static int sh_mobile_sdhi_wait_idle(struct tmio_mmc_host *host)

{

	int timeout = 1000;
@@ -182,8 +175,6 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) 
		mmc_data->cd_gpio = p->cd_gpio;

		if (p->set_pwr)

			mmc_data->set_pwr = sh_mobile_sdhi_set_pwr;

		if (p->get_cd)

			mmc_data->get_cd = sh_mobile_sdhi_get_cd;



		if (p->dma_slave_tx > 0 && p->dma_slave_rx > 0) {

			/*

include/linux/mmc/sh_mobile_sdhi.h

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ struct sh_mobile_sdhi_info { 
	u32 tmio_ocr_mask;	/* available MMC voltages */

	unsigned int cd_gpio;

	void (*set_pwr)(struct platform_device *pdev, int state);

	int (*get_cd)(struct platform_device *pdev);



	/* callbacks for board specific setup code */

	int (*init)(struct platform_device *pdev,