Skip to content

Commit

Permalink
mmc: sh_mobile_sdhi: Remove .get_cd() callback from platform data
Browse files Browse the repository at this point in the history
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: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Chris Ball <cjb@laptop.org>
  • Loading branch information
Laurent Pinchart authored and Chris Ball committed Aug 25, 2013
1 parent 83a0c77 commit 57fcb52
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 10 deletions.
9 changes: 0 additions & 9 deletions drivers/mmc/host/sh_mobile_sdhi.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
/*
Expand Down
1 change: 0 additions & 1 deletion include/linux/mmc/sh_mobile_sdhi.h
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down

0 comments on commit 57fcb52

Please sign in to comment.