From patchwork Mon Sep 29 09:32:55 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Fenkart X-Patchwork-Id: 4994871 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 5D6DEBEEA7 for ; Mon, 29 Sep 2014 09:33:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 76A4120266 for ; Mon, 29 Sep 2014 09:33:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6292C201FA for ; Mon, 29 Sep 2014 09:33:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753198AbaI2JdT (ORCPT ); Mon, 29 Sep 2014 05:33:19 -0400 Received: from mail-we0-f182.google.com ([74.125.82.182]:50977 "EHLO mail-we0-f182.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751558AbaI2JdR (ORCPT ); Mon, 29 Sep 2014 05:33:17 -0400 Received: by mail-we0-f182.google.com with SMTP id x48so1418729wes.13 for ; Mon, 29 Sep 2014 02:33:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6dnIRAeEZdrmwmcaJ+RhOmVS4c56ZhbjZ1PiI1Xb/0o=; b=OFP+ADsgmqqtgSA1V+4KWPjPbThGel0e+VruJmLK/WRx7PlLYb+iuorE3kvaf/N2uc rO73i9AhQ652qtUlKWLZZ0CLVM9kJ8EAgu75RMkB/KMIlrvDQLqV6wuzuHngrdF35oiv CDLnKyFJ5tgPTsikTTAPBfD9doLskBaVf8aAr+e7fR3KcI5j+SszQtFhG9KxK8r9xS9J O8QtlGx1/U4fskZxvnRjPsYLzX0Eh1lG5YRNXhb9T3CnStbfXXOf1NXJTf05IpTjDXtu H8cbVVUSu+B0YKEsxsqqZpfj+uzVaIgsWcJaotE+Deg+/hS/53bViJzc1NqJF/6XGp+U khKw== X-Received: by 10.180.208.13 with SMTP id ma13mr45954230wic.53.1411983196609; Mon, 29 Sep 2014 02:33:16 -0700 (PDT) Received: from localhost (ip-94-112-1-174.net.upcbroadband.cz. [94.112.1.174]) by mx.google.com with ESMTPSA id ky3sm15058666wjb.39.2014.09.29.02.33.15 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Sep 2014 02:33:15 -0700 (PDT) From: Andreas Fenkart To: linux-mmc@vger.kernel.org Cc: linux-omap@vger.kernel.org, Tony Lindgren , Ulf Hansson , pascal.huerst@gmail.com, Andreas Fenkart Subject: [PATCH v2 5/9] omap_hsmmc: remove unused get_context_loss_count callback Date: Mon, 29 Sep 2014 11:32:55 +0200 Message-Id: <1411983179-28677-6-git-send-email-afenkart@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1411983179-28677-1-git-send-email-afenkart@gmail.com> References: <1411983179-28677-1-git-send-email-afenkart@gmail.com> 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, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, 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 trigger of this callback has been removed in 0a82e06e6183 Signed-off-by: Andreas Fenkart diff --git a/arch/arm/mach-omap2/hsmmc.c b/arch/arm/mach-omap2/hsmmc.c index 1c10402..312f13d 100644 --- a/arch/arm/mach-omap2/hsmmc.c +++ b/arch/arm/mach-omap2/hsmmc.c @@ -32,17 +32,6 @@ static u16 control_devconf1_offset; #define HSMMC_NAME_LEN 9 -#if defined(CONFIG_ARCH_OMAP3) && defined(CONFIG_PM) - -static int hsmmc_get_context_loss(struct device *dev) -{ - return omap_pm_get_dev_context_loss_count(dev); -} - -#else -#define hsmmc_get_context_loss NULL -#endif - static void omap_hsmmc1_before_set_reg(struct device *dev, int slot, int power_on, int vdd) { @@ -264,7 +253,6 @@ static int __init omap_hsmmc_pdata_init(struct omap2_hsmmc_info *c, mmc->slots[0].caps = c->caps; mmc->slots[0].internal_clock = !c->ext_clock; mmc->reg_offset = 0; - mmc->get_context_loss_count = hsmmc_get_context_loss; mmc->slots[0].switch_pin = c->gpio_cd; mmc->slots[0].gpio_wp = c->gpio_wp; diff --git a/include/linux/platform_data/hsmmc-omap.h b/include/linux/platform_data/hsmmc-omap.h index 2807786..dc44dfb 100644 --- a/include/linux/platform_data/hsmmc-omap.h +++ b/include/linux/platform_data/hsmmc-omap.h @@ -49,9 +49,6 @@ struct omap_hsmmc_platform_data { int (*suspend)(struct device *dev, int slot); int (*resume)(struct device *dev, int slot); - /* Return context loss count due to PM states changing */ - int (*get_context_loss_count)(struct device *dev); - /* Integrating attributes from the omap_hwmod layer */ u8 controller_flags;