From patchwork Thu Sep 26 14:54:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ulf Hansson X-Patchwork-Id: 20619 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f71.google.com (mail-vb0-f71.google.com [209.85.212.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8431724687 for ; Thu, 26 Sep 2013 14:56:28 +0000 (UTC) Received: by mail-vb0-f71.google.com with SMTP id g17sf1069554vbg.10 for ; Thu, 26 Sep 2013 07:56:28 -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=Kx8zbjGjKU73gnXtYSuVnbXT0kjCv8Cmydugp/xnYKI=; b=VNaVk5nVS7J1G54KrrRJ751PpVz2FD4RjAxEgJp3xnfbMHdkbMVcm+QQDxZuNW8Yly whZf0TolYVgsRrHUJ+N8UuS5JJjdCZa8K96FfEdDq+OW4QJ5CI4b1+K8SRrKFjW8patf O82+T8HJmZvBLUUQRJDhdduo/UvOlPTY2/QjG+9rH2at1F9ISBD8crBZSJE0DGe6PrxI b+36nnPjy+fQXDjf/X+nqC/MXucqL2XHJzHk+YI52lY4TI0WE5gfHHMUNwps2Lt+9ovr 4/6/5JJgfn+jMiTU8gXBMLBj2SQFmbQkBVfjwNBvWODBm204F0C+mFQ6MUfz+DXNyhAL JhZQ== X-Gm-Message-State: ALoCoQmUhaj+ruGRs4JpoSHhHaK0d/qk2975f817z2nIeL9XqKZbAXjCvY1S6qHEUEzBloIiMCpP X-Received: by 10.236.223.130 with SMTP id v2mr276455yhp.34.1380207388334; Thu, 26 Sep 2013 07:56:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.5.9 with SMTP id o9ls990888qeo.49.gmail; Thu, 26 Sep 2013 07:56:28 -0700 (PDT) X-Received: by 10.220.98.212 with SMTP id r20mr18465vcn.48.1380207388198; Thu, 26 Sep 2013 07:56:28 -0700 (PDT) Received: from mail-ve0-f182.google.com (mail-ve0-f182.google.com [209.85.128.182]) by mx.google.com with ESMTPS id g7si491099vcz.120.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:56:28 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.182 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.182; Received: by mail-ve0-f182.google.com with SMTP id oy12so976606veb.41 for ; Thu, 26 Sep 2013 07:55:58 -0700 (PDT) X-Received: by 10.221.64.17 with SMTP id xg17mr1010269vcb.5.1380207358104; Thu, 26 Sep 2013 07:55:58 -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 u4csp371124vcz; Thu, 26 Sep 2013 07:55:57 -0700 (PDT) X-Received: by 10.14.213.68 with SMTP id z44mr1917130eeo.70.1380207357188; Thu, 26 Sep 2013 07:55:57 -0700 (PDT) Received: from mail-ea0-f177.google.com (mail-ea0-f177.google.com [209.85.215.177]) by mx.google.com with ESMTPS id 7si1887396eeo.49.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Sep 2013 07:55:57 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.177 is neither permitted nor denied by best guess record for domain of ulf.hansson@linaro.org) client-ip=209.85.215.177; Received: by mail-ea0-f177.google.com with SMTP id f15so596301eak.8 for ; Thu, 26 Sep 2013 07:55:56 -0700 (PDT) X-Received: by 10.15.23.69 with SMTP id g45mr732580eeu.90.1380207356482; Thu, 26 Sep 2013 07:55:56 -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:55:55 -0700 (PDT) From: Ulf Hansson To: linux-kernel@vger.kernel.org, linux-mmc@vger.kernel.org, Chris Ball Cc: Ulf Hansson , Ben Dooks , linux-arm-kernel@lists.infradead.org Subject: [PATCH 18/27] mmc: s3cmci: Remove redundant suspend and resume callbacks Date: Thu, 26 Sep 2013 16:54:43 +0200 Message-Id: <1380207292-16968-19-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.128.182 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 handled by the protocol layer and consequently the mmc_suspend|resume_host APIs are marked as deprecated. While moving away from using the deprecated APIs, there are nothing left to be done for the suspend and resume callbacks, so remove them. Cc: Ben Dooks Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Ulf Hansson --- drivers/mmc/host/s3cmci.c | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/drivers/mmc/host/s3cmci.c b/drivers/mmc/host/s3cmci.c index 8d6794c..2fce5ea 100644 --- a/drivers/mmc/host/s3cmci.c +++ b/drivers/mmc/host/s3cmci.c @@ -1949,39 +1949,10 @@ static struct platform_device_id s3cmci_driver_ids[] = { MODULE_DEVICE_TABLE(platform, s3cmci_driver_ids); - -#ifdef CONFIG_PM - -static int s3cmci_suspend(struct device *dev) -{ - struct mmc_host *mmc = platform_get_drvdata(to_platform_device(dev)); - - return mmc_suspend_host(mmc); -} - -static int s3cmci_resume(struct device *dev) -{ - struct mmc_host *mmc = platform_get_drvdata(to_platform_device(dev)); - - return mmc_resume_host(mmc); -} - -static const struct dev_pm_ops s3cmci_pm = { - .suspend = s3cmci_suspend, - .resume = s3cmci_resume, -}; - -#define s3cmci_pm_ops &s3cmci_pm -#else /* CONFIG_PM */ -#define s3cmci_pm_ops NULL -#endif /* CONFIG_PM */ - - static struct platform_driver s3cmci_driver = { .driver = { .name = "s3c-sdi", .owner = THIS_MODULE, - .pm = s3cmci_pm_ops, }, .id_table = s3cmci_driver_ids, .probe = s3cmci_probe,