diff options
author | Faiz Abbas <faiz_abbas@ti.com> | 2017-07-14 08:46:44 -0400 |
---|---|---|
committer | Ulf Hansson <ulf.hansson@linaro.org> | 2017-07-17 09:05:52 -0400 |
commit | 36acbd9e8377c27570b887e2332a5e1f0b140e16 (patch) | |
tree | 14c194e357e15cc5cc22ef4c1e85ed0c2415b198 | |
parent | ba64792ff9b4612ab20623118e0b616e760ecdf7 (diff) |
mmc: host: omap_hsmmc: remove unused platform callbacks
Remove unused callbacks in the omap_hsmmc_platform_data structure
Signed-off-by: Faiz Abbas <faiz_abbas@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 11 | ||||
-rw-r--r-- | include/linux/platform_data/hsmmc-omap.h | 10 |
2 files changed, 0 insertions, 21 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 7c12f3715676..04ff3c97a535 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c | |||
@@ -356,9 +356,6 @@ static int omap_hsmmc_set_power(struct omap_hsmmc_host *host, int power_on, | |||
356 | struct mmc_host *mmc = host->mmc; | 356 | struct mmc_host *mmc = host->mmc; |
357 | int ret = 0; | 357 | int ret = 0; |
358 | 358 | ||
359 | if (mmc_pdata(host)->set_power) | ||
360 | return mmc_pdata(host)->set_power(host->dev, power_on, vdd); | ||
361 | |||
362 | /* | 359 | /* |
363 | * If we don't see a Vcc regulator, assume it's a fixed | 360 | * If we don't see a Vcc regulator, assume it's a fixed |
364 | * voltage always-on regulator. | 361 | * voltage always-on regulator. |
@@ -366,9 +363,6 @@ static int omap_hsmmc_set_power(struct omap_hsmmc_host *host, int power_on, | |||
366 | if (IS_ERR(mmc->supply.vmmc)) | 363 | if (IS_ERR(mmc->supply.vmmc)) |
367 | return 0; | 364 | return 0; |
368 | 365 | ||
369 | if (mmc_pdata(host)->before_set_reg) | ||
370 | mmc_pdata(host)->before_set_reg(host->dev, power_on, vdd); | ||
371 | |||
372 | ret = omap_hsmmc_set_pbias(host, false, 0); | 366 | ret = omap_hsmmc_set_pbias(host, false, 0); |
373 | if (ret) | 367 | if (ret) |
374 | return ret; | 368 | return ret; |
@@ -400,9 +394,6 @@ static int omap_hsmmc_set_power(struct omap_hsmmc_host *host, int power_on, | |||
400 | return ret; | 394 | return ret; |
401 | } | 395 | } |
402 | 396 | ||
403 | if (mmc_pdata(host)->after_set_reg) | ||
404 | mmc_pdata(host)->after_set_reg(host->dev, power_on, vdd); | ||
405 | |||
406 | return 0; | 397 | return 0; |
407 | 398 | ||
408 | err_set_voltage: | 399 | err_set_voltage: |
@@ -469,8 +460,6 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) | |||
469 | int ret; | 460 | int ret; |
470 | struct mmc_host *mmc = host->mmc; | 461 | struct mmc_host *mmc = host->mmc; |
471 | 462 | ||
472 | if (mmc_pdata(host)->set_power) | ||
473 | return 0; | ||
474 | 463 | ||
475 | ret = mmc_regulator_get_supply(mmc); | 464 | ret = mmc_regulator_get_supply(mmc); |
476 | if (ret == -EPROBE_DEFER) | 465 | if (ret == -EPROBE_DEFER) |
diff --git a/include/linux/platform_data/hsmmc-omap.h b/include/linux/platform_data/hsmmc-omap.h index 8e981be2e2c2..0ff1e0dba720 100644 --- a/include/linux/platform_data/hsmmc-omap.h +++ b/include/linux/platform_data/hsmmc-omap.h | |||
@@ -55,9 +55,6 @@ struct omap_hsmmc_platform_data { | |||
55 | u32 caps; /* Used for the MMC driver on 2430 and later */ | 55 | u32 caps; /* Used for the MMC driver on 2430 and later */ |
56 | u32 pm_caps; /* PM capabilities of the mmc */ | 56 | u32 pm_caps; /* PM capabilities of the mmc */ |
57 | 57 | ||
58 | /* use the internal clock */ | ||
59 | unsigned internal_clock:1; | ||
60 | |||
61 | /* nonremovable e.g. eMMC */ | 58 | /* nonremovable e.g. eMMC */ |
62 | unsigned nonremovable:1; | 59 | unsigned nonremovable:1; |
63 | 60 | ||
@@ -73,13 +70,6 @@ struct omap_hsmmc_platform_data { | |||
73 | int gpio_cd; /* gpio (card detect) */ | 70 | int gpio_cd; /* gpio (card detect) */ |
74 | int gpio_cod; /* gpio (cover detect) */ | 71 | int gpio_cod; /* gpio (cover detect) */ |
75 | int gpio_wp; /* gpio (write protect) */ | 72 | int gpio_wp; /* gpio (write protect) */ |
76 | |||
77 | int (*set_power)(struct device *dev, int power_on, int vdd); | ||
78 | void (*remux)(struct device *dev, int power_on); | ||
79 | /* Call back before enabling / disabling regulators */ | ||
80 | void (*before_set_reg)(struct device *dev, int power_on, int vdd); | ||
81 | /* Call back after enabling / disabling regulators */ | ||
82 | void (*after_set_reg)(struct device *dev, int power_on, int vdd); | ||
83 | /* if we have special card, init it using this callback */ | 73 | /* if we have special card, init it using this callback */ |
84 | void (*init_card)(struct mmc_card *card); | 74 | void (*init_card)(struct mmc_card *card); |
85 | 75 | ||