Commit 76a411f9 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Chris Ball

mmc: sh_mobile_sdhi: remove unused .pdata field

The struct sh_mobile_sdhi_info::pdata field was only used for platform-
based card detection and isn't used anymore since the migration to GPIO-
based MMC slot functions. Remove it.
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent 5a00a971
...@@ -156,7 +156,6 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) ...@@ -156,7 +156,6 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev)
mmc_data = &priv->mmc_data; mmc_data = &priv->mmc_data;
if (p) { if (p) {
p->pdata = mmc_data;
if (p->init) { if (p->init) {
ret = p->init(pdev, &sdhi_ops); ret = p->init(pdev, &sdhi_ops);
if (ret) if (ret)
...@@ -310,9 +309,6 @@ static int sh_mobile_sdhi_remove(struct platform_device *pdev) ...@@ -310,9 +309,6 @@ static int sh_mobile_sdhi_remove(struct platform_device *pdev)
struct sh_mobile_sdhi_info *p = pdev->dev.platform_data; struct sh_mobile_sdhi_info *p = pdev->dev.platform_data;
int i = 0, irq; int i = 0, irq;
if (p)
p->pdata = NULL;
tmio_mmc_host_remove(host); tmio_mmc_host_remove(host);
while (1) { while (1) {
......
...@@ -4,7 +4,6 @@ ...@@ -4,7 +4,6 @@
#include <linux/types.h> #include <linux/types.h>
struct platform_device; struct platform_device;
struct tmio_mmc_data;
#define SH_MOBILE_SDHI_IRQ_CARD_DETECT "card_detect" #define SH_MOBILE_SDHI_IRQ_CARD_DETECT "card_detect"
#define SH_MOBILE_SDHI_IRQ_SDCARD "sdcard" #define SH_MOBILE_SDHI_IRQ_SDCARD "sdcard"
...@@ -26,7 +25,6 @@ struct sh_mobile_sdhi_info { ...@@ -26,7 +25,6 @@ struct sh_mobile_sdhi_info {
unsigned long tmio_caps2; unsigned long tmio_caps2;
u32 tmio_ocr_mask; /* available MMC voltages */ u32 tmio_ocr_mask; /* available MMC voltages */
unsigned int cd_gpio; unsigned int cd_gpio;
struct tmio_mmc_data *pdata;
void (*set_pwr)(struct platform_device *pdev, int state); void (*set_pwr)(struct platform_device *pdev, int state);
int (*get_cd)(struct platform_device *pdev); int (*get_cd)(struct platform_device *pdev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment