Commit 010f4aa7 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Ulf Hansson
Browse files

mmc: sh_mobile_sdhi: remove .init/.cleanup 



No one is using .init/.cleanup callback function.
Let's remove these.
sdhi_ops and .cd_wakeup are also removed

Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 361936ef

drivers/mmc/host/sh_mobile_sdhi.c

+1 −25
Original line number Diff line number Diff line
@@ -156,15 +156,6 @@ static int sh_mobile_sdhi_multi_io_quirk(struct mmc_card *card, 
	return blk_size;

}



static void sh_mobile_sdhi_cd_wakeup(const struct platform_device *pdev)

{

	mmc_detect_change(platform_get_drvdata(pdev), msecs_to_jiffies(100));

}



static const struct sh_mobile_sdhi_ops sdhi_ops = {

	.cd_wakeup = sh_mobile_sdhi_cd_wakeup,

};



static int sh_mobile_sdhi_probe(struct platform_device *pdev)

{

	const struct of_device_id *of_id =
@@ -192,19 +183,11 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) 
	mmc_data = &priv->mmc_data;

	dma_priv = &priv->dma_priv;



	if (p) {

		if (p->init) {

			ret = p->init(pdev, &sdhi_ops);

			if (ret)

				return ret;

		}

	}



	priv->clk = devm_clk_get(&pdev->dev, NULL);

	if (IS_ERR(priv->clk)) {

		ret = PTR_ERR(priv->clk);

		dev_err(&pdev->dev, "cannot get clock: %d\n", ret);

		goto eclkget;

		goto eprobe;

	}



	host = tmio_mmc_host_alloc(pdev);
@@ -359,9 +342,6 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) 
efree:

	tmio_mmc_host_free(host);

eprobe:

eclkget:

	if (p && p->cleanup)

		p->cleanup(pdev);

	return ret;

}
@@ -369,13 +349,9 @@ static int sh_mobile_sdhi_remove(struct platform_device *pdev) 
{

	struct mmc_host *mmc = platform_get_drvdata(pdev);

	struct tmio_mmc_host *host = mmc_priv(mmc);

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



	tmio_mmc_host_remove(host);



	if (p && p->cleanup)

		p->cleanup(pdev);



	return 0;

}

include/linux/mmc/sh_mobile_sdhi.h

+0 −15
Original line number Diff line number Diff line
@@ -3,20 +3,10 @@ 


#include <linux/types.h>



struct platform_device;



#define SH_MOBILE_SDHI_IRQ_CARD_DETECT	"card_detect"

#define SH_MOBILE_SDHI_IRQ_SDCARD	"sdcard"

#define SH_MOBILE_SDHI_IRQ_SDIO		"sdio"



/**

 * struct sh_mobile_sdhi_ops - SDHI driver callbacks

 * @cd_wakeup:		trigger a card-detection run

 */

struct sh_mobile_sdhi_ops {

	void (*cd_wakeup)(const struct platform_device *pdev);

};



struct sh_mobile_sdhi_info {

	int dma_slave_tx;

	int dma_slave_rx;
@@ -25,11 +15,6 @@ struct sh_mobile_sdhi_info { 
	unsigned long tmio_caps2;

	u32 tmio_ocr_mask;	/* available MMC voltages */

	unsigned int cd_gpio;



	/* callbacks for board specific setup code */

	int (*init)(struct platform_device *pdev,

		    const struct sh_mobile_sdhi_ops *ops);

	void (*cleanup)(struct platform_device *pdev);

};



#endif /* LINUX_MMC_SH_MOBILE_SDHI_H */