From patchwork Thu Sep 26 14:54:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 20626 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qe0-f72.google.com (mail-qe0-f72.google.com [209.85.128.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 0338C24687 for ; Thu, 26 Sep 2013 14:56:48 +0000 (UTC) Received: by mail-qe0-f72.google.com with SMTP id 6sf1093198qea.11 for ; Thu, 26 Sep 2013 07:56:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=DGvHg9BCKzNnpqGLUSAngJTyNJlycL+aXR6kP4eIoQU=; b=aXSENkevO52PKJydwxaCuKzJpgS1nEcJJde3zw0bKauf63TJmwLYQ+P29arR4huUf3 rgm969WlbDGztrHWg3kABTJpCOwgrgrQR5YIi+e6UecFeaDulaJTtM7P5B8douKTTTKV ZPMb2nRxW8T2PVA8R4O97PiVwttqq7DRkcSD+GsjyHS36+k/21DI+58UxjE+Bs/rj/U5 Rzo+O3F5Jn5zQYf9uf+FgKpo0pqITwAi86uFzvhBpCbwrp6VZL/PH5xuCWGJu89rXDs8 W6ki2BgELvtp/s9Uc0W4QvnrwOtXokkvLYyYTlvdgNA1DMW/qEgcy2YSCTA0z4dlO8Hk 7FPA== X-Gm-Message-State: ALoCoQlknDoh3StQmZeW9cnBZSkD6d3vb1alxYE7Ru5vBN1YT4FI3SamWUnNJVrWWCEOxxFU1cGI X-Received: by 10.236.36.39 with SMTP id v27mr270451yha.5.1380207407840; Thu, 26 Sep 2013 07:56:47 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.104.177 with SMTP id gf17ls839543qeb.4.gmail; Thu, 26 Sep 2013 07:56:47 -0700 (PDT) X-Received: by 10.52.120.78 with SMTP id la14mr873279vdb.9.1380207407716; Thu, 26 Sep 2013 07:56:47 -0700 (PDT) Received: from mail-vb0-f53.google.com (mail-vb0-f53.google.com [209.85.212.53]) by mx.google.com with ESMTPS id ge8si487716vec.143.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:47 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.53 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.53; Received: by mail-vb0-f53.google.com with SMTP id i3so910252vbh.40 for ; Thu, 26 Sep 2013 07:56:17 -0700 (PDT) X-Received: by 10.220.15.132 with SMTP id k4mr76593vca.45.1380207377627; Thu, 26 Sep 2013 07:56:17 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp371155vcz; Thu, 26 Sep 2013 07:56:17 -0700 (PDT) X-Received: by 10.15.64.1 with SMTP id n1mr1907648eex.15.1380207376424; Thu, 26 Sep 2013 07:56:16 -0700 (PDT) Received: from mail-ee0-f42.google.com (mail-ee0-f42.google.com [74.125.83.42]) by mx.google.com with ESMTPS id i5si1821972eeg.325.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:16 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.83.42 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=74.125.83.42; Received: by mail-ee0-f42.google.com with SMTP id b45so624672eek.1 for ; Thu, 26 Sep 2013 07:56:15 -0700 (PDT) X-Received: by 10.14.224.198 with SMTP id x46mr1866001eep.53.1380207375870; Thu, 26 Sep 2013 07:56:15 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id x47sm4813555eea.16.1969.12.31.16.00.00 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:15 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Bruce Chang , Harald Welte Subject: [PATCH 25/27] mmc: via-sdmmc: Move away from using deprecated APIs Date: Thu, 26 Sep 2013 16:54:50 +0200 Message-Id: <1380207292-16968-26-git-send-email-ulf.hansson@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1380207292-16968-1-git-send-email-ulf.hansson@linaro.org> References: <1380207292-16968-1-git-send-email-ulf.hansson@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: ulf.hansson@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.53 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Suspend and resume of cards are being handled from the protocol layer and consequently the mmc_suspend|resume_host APIs are deprecated. This means we can simplify the suspend|resume callbacks by removing the use of the deprecated APIs. Cc: Bruce Chang Cc: Harald Welte Signed-off-by: Ulf Hansson --- drivers/mmc/host/via-sdmmc.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/mmc/host/via-sdmmc.c b/drivers/mmc/host/via-sdmmc.c index 4f84586..63fac78 100644 --- a/drivers/mmc/host/via-sdmmc.c +++ b/drivers/mmc/host/via-sdmmc.c @@ -1269,21 +1269,18 @@ static void via_init_sdc_pm(struct via_crdr_mmc_host *host) static int via_sd_suspend(struct pci_dev *pcidev, pm_message_t state) { struct via_crdr_mmc_host *host; - int ret = 0; host = pci_get_drvdata(pcidev); via_save_pcictrlreg(host); via_save_sdcreg(host); - ret = mmc_suspend_host(host->mmc); - pci_save_state(pcidev); pci_enable_wake(pcidev, pci_choose_state(pcidev, state), 0); pci_disable_device(pcidev); pci_set_power_state(pcidev, pci_choose_state(pcidev, state)); - return ret; + return 0; } static int via_sd_resume(struct pci_dev *pcidev) @@ -1316,8 +1313,6 @@ static int via_sd_resume(struct pci_dev *pcidev) via_restore_pcictrlreg(sdhost); via_init_sdc_pm(sdhost); - ret = mmc_resume_host(sdhost->mmc); - return ret; }