aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2013-09-25 08:07:06 -0400
committerChris Ball <cjb@laptop.org>2013-10-30 20:26:43 -0400
commit990b2993d11489cb6ee19f948d203afb35871071 (patch)
tree5659765695cad5671f2cc23cb5741505e14a555f
parent4d6c5d83395778192a9c14c0f88dabac5d7a9254 (diff)
mmc: vub300: Move away from using deprecated APIs
Suspend and resume of cards are handled by the protocol layer and consequently the mmc_suspend|resume_host APIs are marked as deprecated. This means we can simplify the suspend|resume callbacks by removing the use of the deprecated APIs. Cc: Tony Olech <tony.olech@elandigitalsystems.com> Cc: linux-usb@vger.kernel.org Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Cc: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r--drivers/mmc/host/vub300.c18
1 files changed, 2 insertions, 16 deletions
diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c
index e9028ad05ffb..4262296c12fa 100644
--- a/drivers/mmc/host/vub300.c
+++ b/drivers/mmc/host/vub300.c
@@ -2392,26 +2392,12 @@ static void vub300_disconnect(struct usb_interface *interface)
2392#ifdef CONFIG_PM 2392#ifdef CONFIG_PM
2393static int vub300_suspend(struct usb_interface *intf, pm_message_t message) 2393static int vub300_suspend(struct usb_interface *intf, pm_message_t message)
2394{ 2394{
2395 struct vub300_mmc_host *vub300 = usb_get_intfdata(intf); 2395 return 0;
2396 if (!vub300 || !vub300->mmc) {
2397 return 0;
2398 } else {
2399 struct mmc_host *mmc = vub300->mmc;
2400 mmc_suspend_host(mmc);
2401 return 0;
2402 }
2403} 2396}
2404 2397
2405static int vub300_resume(struct usb_interface *intf) 2398static int vub300_resume(struct usb_interface *intf)
2406{ 2399{
2407 struct vub300_mmc_host *vub300 = usb_get_intfdata(intf); 2400 return 0;
2408 if (!vub300 || !vub300->mmc) {
2409 return 0;
2410 } else {
2411 struct mmc_host *mmc = vub300->mmc;
2412 mmc_resume_host(mmc);
2413 return 0;
2414 }
2415} 2401}
2416#else 2402#else
2417#define vub300_suspend NULL 2403#define vub300_suspend NULL