Skip to content

Commit 36acbd9

Browse files
Faiz-Abbasstorulf
authored andcommitted
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>
1 parent ba64792 commit 36acbd9

File tree

2 files changed

+0
-21
lines changed

2 files changed

+0
-21
lines changed

drivers/mmc/host/omap_hsmmc.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -356,19 +356,13 @@ static int omap_hsmmc_set_power(struct omap_hsmmc_host *host, int power_on,
356356
struct mmc_host *mmc = host->mmc;
357357
int ret = 0;
358358

359-
if (mmc_pdata(host)->set_power)
360-
return mmc_pdata(host)->set_power(host->dev, power_on, vdd);
361-
362359
/*
363360
* If we don't see a Vcc regulator, assume it's a fixed
364361
* voltage always-on regulator.
365362
*/
366363
if (IS_ERR(mmc->supply.vmmc))
367364
return 0;
368365

369-
if (mmc_pdata(host)->before_set_reg)
370-
mmc_pdata(host)->before_set_reg(host->dev, power_on, vdd);
371-
372366
ret = omap_hsmmc_set_pbias(host, false, 0);
373367
if (ret)
374368
return ret;
@@ -400,9 +394,6 @@ static int omap_hsmmc_set_power(struct omap_hsmmc_host *host, int power_on,
400394
return ret;
401395
}
402396

403-
if (mmc_pdata(host)->after_set_reg)
404-
mmc_pdata(host)->after_set_reg(host->dev, power_on, vdd);
405-
406397
return 0;
407398

408399
err_set_voltage:
@@ -469,8 +460,6 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host)
469460
int ret;
470461
struct mmc_host *mmc = host->mmc;
471462

472-
if (mmc_pdata(host)->set_power)
473-
return 0;
474463

475464
ret = mmc_regulator_get_supply(mmc);
476465
if (ret == -EPROBE_DEFER)

include/linux/platform_data/hsmmc-omap.h

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ struct omap_hsmmc_platform_data {
5555
u32 caps; /* Used for the MMC driver on 2430 and later */
5656
u32 pm_caps; /* PM capabilities of the mmc */
5757

58-
/* use the internal clock */
59-
unsigned internal_clock:1;
60-
6158
/* nonremovable e.g. eMMC */
6259
unsigned nonremovable:1;
6360

@@ -73,13 +70,6 @@ struct omap_hsmmc_platform_data {
7370
int gpio_cd; /* gpio (card detect) */
7471
int gpio_cod; /* gpio (cover detect) */
7572
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);
8373
/* if we have special card, init it using this callback */
8474
void (*init_card)(struct mmc_card *card);
8575

0 commit comments

Comments
 (0)