From patchwork Mon Sep 30 08:18:24 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 2962871 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3B1F6BFF0B for ; Mon, 30 Sep 2013 08:19:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0D30D20200 for ; Mon, 30 Sep 2013 08:18:59 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8754B201FD for ; Mon, 30 Sep 2013 08:18:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754336Ab3I3ISk (ORCPT ); Mon, 30 Sep 2013 04:18:40 -0400 Received: from mail-ee0-f54.google.com ([74.125.83.54]:52596 "EHLO mail-ee0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754321Ab3I3ISf (ORCPT ); Mon, 30 Sep 2013 04:18:35 -0400 Received: by mail-ee0-f54.google.com with SMTP id e53so2511814eek.13 for ; Mon, 30 Sep 2013 01:18:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=MOc/Kr0e/S/EM4uIhxde2EBcyueHdgddUMMQjnLEVyg=; b=Ga53yXK1BIvuTAlltT/e93sd0lthESOku5dnzLwcc6cUNgVkhh5xisq7JSr4EiBkbr S06trMP5GKWzgYI6BeNvpktxQc1gSWfJ6mx1h5zyO9XNFyieWFBRPfxY3XZ0XJqEIKGf 5LhqV2PENmykwTiwJKehaosIiz5Ev+c+JTk8OqqW0nSaGvpyw2t7VlDn/YZH6IwCihML Q0RbT6cAITsN7gZewLW8TB+WE4UgJzX0aSEM3gIMfedDl4yejScLHH8iq3Z+2x/FE36A YFz9rLxrkCuEFlMlzU7/V/QqX4ECSj5RAZ8jSEBtthYyYzSGfUdxSKCGkmHmYjpIqkBx fkWA== X-Gm-Message-State: ALoCoQk8ehqU8OGSDFPYBPrbQH9m5wxXo3fxkSX2xYPn+S/x+o+UviRMpG6h6b1mN21Kg0TdQBPE X-Received: by 10.15.98.9 with SMTP id bi9mr1273919eeb.67.1380529113799; Mon, 30 Sep 2013 01:18:33 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id a1sm48398213eem.1.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 30 Sep 2013 01:18:33 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Tony Olech , linux-usb@vger.kernel.org, Alan Stern Subject: [PATCH] mmc: vub300: Move away from using deprecated APIs Date: Mon, 30 Sep 2013 10:18:24 +0200 Message-Id: <1380529104-25818-1-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Spam-Status: No, score=-7.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 Cc: linux-usb@vger.kernel.org Signed-off-by: Ulf Hansson Cc: Alan Stern --- drivers/mmc/host/vub300.c | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c index e9028ad..4262296 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) #ifdef CONFIG_PM static int vub300_suspend(struct usb_interface *intf, pm_message_t message) { - struct vub300_mmc_host *vub300 = usb_get_intfdata(intf); - if (!vub300 || !vub300->mmc) { - return 0; - } else { - struct mmc_host *mmc = vub300->mmc; - mmc_suspend_host(mmc); - return 0; - } + return 0; } static int vub300_resume(struct usb_interface *intf) { - struct vub300_mmc_host *vub300 = usb_get_intfdata(intf); - if (!vub300 || !vub300->mmc) { - return 0; - } else { - struct mmc_host *mmc = vub300->mmc; - mmc_resume_host(mmc); - return 0; - } + return 0; } #else #define vub300_suspend NULL