diff options
author | Balaji T K <balajitk@ti.com> | 2012-03-07 09:55:30 -0500 |
---|---|---|
committer | Chris Ball <cjb@laptop.org> | 2012-03-27 12:19:59 -0400 |
commit | 80d17f3a1bd8b5045fedb7dee6b41208497c72d0 (patch) | |
tree | 99b210c3ff56c7e2e75ea6cd0ce49fff811edc6a /drivers | |
parent | b7bf773b0eaac633276a8c3b2867db4d8b64c04a (diff) |
mmc: omap_hsmmc: remove unused .set_sleep function
set_sleep seems to be unused in omap_hsmmc driver. so get rid of it.
Signed-off-by: Balaji T K <balajitk@ti.com>
Signed-off-by: Rajendra Nayak <rnayak@ti.com>
Tested-by: Venkatraman S <svenkatr@ti.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mmc/host/omap_hsmmc.c | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index a6f19f17f0d8..3f77fd94e5d8 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c | |||
@@ -324,61 +324,6 @@ static int omap_hsmmc_4_set_power(struct device *dev, int slot, int power_on, | |||
324 | return 0; | 324 | return 0; |
325 | } | 325 | } |
326 | 326 | ||
327 | static int omap_hsmmc_1_set_sleep(struct device *dev, int slot, int sleep, | ||
328 | int vdd, int cardsleep) | ||
329 | { | ||
330 | struct omap_hsmmc_host *host = | ||
331 | platform_get_drvdata(to_platform_device(dev)); | ||
332 | int mode = sleep ? REGULATOR_MODE_STANDBY : REGULATOR_MODE_NORMAL; | ||
333 | |||
334 | return regulator_set_mode(host->vcc, mode); | ||
335 | } | ||
336 | |||
337 | static int omap_hsmmc_235_set_sleep(struct device *dev, int slot, int sleep, | ||
338 | int vdd, int cardsleep) | ||
339 | { | ||
340 | struct omap_hsmmc_host *host = | ||
341 | platform_get_drvdata(to_platform_device(dev)); | ||
342 | int err, mode; | ||
343 | |||
344 | /* | ||
345 | * If we don't see a Vcc regulator, assume it's a fixed | ||
346 | * voltage always-on regulator. | ||
347 | */ | ||
348 | if (!host->vcc) | ||
349 | return 0; | ||
350 | |||
351 | mode = sleep ? REGULATOR_MODE_STANDBY : REGULATOR_MODE_NORMAL; | ||
352 | |||
353 | if (!host->vcc_aux) | ||
354 | return regulator_set_mode(host->vcc, mode); | ||
355 | |||
356 | if (cardsleep) { | ||
357 | /* VCC can be turned off if card is asleep */ | ||
358 | if (sleep) | ||
359 | err = mmc_regulator_set_ocr(host->mmc, host->vcc, 0); | ||
360 | else | ||
361 | err = mmc_regulator_set_ocr(host->mmc, host->vcc, vdd); | ||
362 | } else | ||
363 | err = regulator_set_mode(host->vcc, mode); | ||
364 | if (err) | ||
365 | return err; | ||
366 | |||
367 | if (!mmc_slot(host).vcc_aux_disable_is_sleep) | ||
368 | return regulator_set_mode(host->vcc_aux, mode); | ||
369 | |||
370 | if (sleep) | ||
371 | return regulator_disable(host->vcc_aux); | ||
372 | else | ||
373 | return regulator_enable(host->vcc_aux); | ||
374 | } | ||
375 | |||
376 | static int omap_hsmmc_4_set_sleep(struct device *dev, int slot, int sleep, | ||
377 | int vdd, int cardsleep) | ||
378 | { | ||
379 | return 0; | ||
380 | } | ||
381 | |||
382 | static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) | 327 | static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) |
383 | { | 328 | { |
384 | struct regulator *reg; | 329 | struct regulator *reg; |
@@ -389,18 +334,15 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) | |||
389 | case OMAP_MMC1_DEVID: | 334 | case OMAP_MMC1_DEVID: |
390 | /* On-chip level shifting via PBIAS0/PBIAS1 */ | 335 | /* On-chip level shifting via PBIAS0/PBIAS1 */ |
391 | mmc_slot(host).set_power = omap_hsmmc_1_set_power; | 336 | mmc_slot(host).set_power = omap_hsmmc_1_set_power; |
392 | mmc_slot(host).set_sleep = omap_hsmmc_1_set_sleep; | ||
393 | break; | 337 | break; |
394 | case OMAP_MMC2_DEVID: | 338 | case OMAP_MMC2_DEVID: |
395 | case OMAP_MMC3_DEVID: | 339 | case OMAP_MMC3_DEVID: |
396 | case OMAP_MMC5_DEVID: | 340 | case OMAP_MMC5_DEVID: |
397 | /* Off-chip level shifting, or none */ | 341 | /* Off-chip level shifting, or none */ |
398 | mmc_slot(host).set_power = omap_hsmmc_235_set_power; | 342 | mmc_slot(host).set_power = omap_hsmmc_235_set_power; |
399 | mmc_slot(host).set_sleep = omap_hsmmc_235_set_sleep; | ||
400 | break; | 343 | break; |
401 | case OMAP_MMC4_DEVID: | 344 | case OMAP_MMC4_DEVID: |
402 | mmc_slot(host).set_power = omap_hsmmc_4_set_power; | 345 | mmc_slot(host).set_power = omap_hsmmc_4_set_power; |
403 | mmc_slot(host).set_sleep = omap_hsmmc_4_set_sleep; | ||
404 | default: | 346 | default: |
405 | pr_err("MMC%d configuration not supported!\n", host->id); | 347 | pr_err("MMC%d configuration not supported!\n", host->id); |
406 | return -EINVAL; | 348 | return -EINVAL; |
@@ -462,7 +404,6 @@ static int omap_hsmmc_reg_get(struct omap_hsmmc_host *host) | |||
462 | 404 | ||
463 | err: | 405 | err: |
464 | mmc_slot(host).set_power = NULL; | 406 | mmc_slot(host).set_power = NULL; |
465 | mmc_slot(host).set_sleep = NULL; | ||
466 | return ret; | 407 | return ret; |
467 | } | 408 | } |
468 | 409 | ||
@@ -471,7 +412,6 @@ static void omap_hsmmc_reg_put(struct omap_hsmmc_host *host) | |||
471 | regulator_put(host->vcc); | 412 | regulator_put(host->vcc); |
472 | regulator_put(host->vcc_aux); | 413 | regulator_put(host->vcc_aux); |
473 | mmc_slot(host).set_power = NULL; | 414 | mmc_slot(host).set_power = NULL; |
474 | mmc_slot(host).set_sleep = NULL; | ||
475 | } | 415 | } |
476 | 416 | ||
477 | static inline int omap_hsmmc_have_reg(void) | 417 | static inline int omap_hsmmc_have_reg(void) |