From patchwork Fri Feb 15 15:13:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2148381 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 279E33FE80 for ; Fri, 15 Feb 2013 15:14:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932605Ab3BOPOT (ORCPT ); Fri, 15 Feb 2013 10:14:19 -0500 Received: from moutng.kundenserver.de ([212.227.126.186]:63501 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755600Ab3BOPOP (ORCPT ); Fri, 15 Feb 2013 10:14:15 -0500 Received: from axis700.grange (dslb-188-109-033-039.pools.arcor-ip.net [188.109.33.39]) by mrelayeu.kundenserver.de (node=mreu2) with ESMTP (Nemesis) id 0MKMb4-1U4j5u1ZZ8-001Bnb; Fri, 15 Feb 2013 16:14:12 +0100 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id 3D12140BC4; Fri, 15 Feb 2013 16:14:10 +0100 (CET) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1U6MzK-0004ju-0O; Fri, 15 Feb 2013 16:14:10 +0100 From: Guennadi Liakhovetski To: linux-mmc@vger.kernel.org Cc: devicetree-discuss@lists.ozlabs.org, linux-sh@vger.kernel.org, Magnus Damm , Simon Horman , Arnd Bergmann , Guennadi Liakhovetski Subject: [PATCH v4 08/13] mmc: sh_mobile_sdhi: remove unused .pdata field Date: Fri, 15 Feb 2013 16:13:57 +0100 Message-Id: <1360941242-18153-9-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1360941242-18153-1-git-send-email-g.liakhovetski@gmx.de> References: <1360941242-18153-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:jhiKk/5MW1PbrSLFH/goEVWw0U2NPRJEKdCkILrKqGW Kr1bOxUzRpe5m4oaDuH+osmjx3J5ApIXupYwZcVbq7TXMXKBsv 3jTsdNnwWPz/DlcGpdgLmqmainj9vNZx05J+YpETFP/8O+W5tU fOU20+273nhLU1yBHQ1yXip0jAN/rrbyWPR5INe6yEGEGIyNz2 /0iDeRSPWbNR7uh2yyDzsWHFPfSb75yL/rOFIV7hrPp8M6uMot XR0E9gUsgG6XhfkVq9bVQB33/Zyhh+l5di7dpEvRRgwtWss3Z4 dtcthaYFIW/K4ZHHn9MH1yDDEpnANzy9Zc1lYnONAwSpdzloGE H16zKbgDWvWecU1lPaGrMBzKlECwsLgK7q/xtSLKyZSqsY8iSA nlHNM9RCjqtIw== Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org The struct sh_mobile_sdhi_info::pdata field was only used for platform- based card detection and isn't used anymore since the migration to GPIO- based MMC slot functions. Remove it. Signed-off-by: Guennadi Liakhovetski --- drivers/mmc/host/sh_mobile_sdhi.c | 4 ---- include/linux/mmc/sh_mobile_sdhi.h | 2 -- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/drivers/mmc/host/sh_mobile_sdhi.c b/drivers/mmc/host/sh_mobile_sdhi.c index 06e1bc9..175ab97 100644 --- a/drivers/mmc/host/sh_mobile_sdhi.c +++ b/drivers/mmc/host/sh_mobile_sdhi.c @@ -156,7 +156,6 @@ static int sh_mobile_sdhi_probe(struct platform_device *pdev) mmc_data = &priv->mmc_data; if (p) { - p->pdata = mmc_data; if (p->init) { ret = p->init(pdev, &sdhi_ops); if (ret) @@ -310,9 +309,6 @@ static int sh_mobile_sdhi_remove(struct platform_device *pdev) struct sh_mobile_sdhi_info *p = pdev->dev.platform_data; int i = 0, irq; - if (p) - p->pdata = NULL; - tmio_mmc_host_remove(host); while (1) { diff --git a/include/linux/mmc/sh_mobile_sdhi.h b/include/linux/mmc/sh_mobile_sdhi.h index b65679f..b76bcf0 100644 --- a/include/linux/mmc/sh_mobile_sdhi.h +++ b/include/linux/mmc/sh_mobile_sdhi.h @@ -4,7 +4,6 @@ #include struct platform_device; -struct tmio_mmc_data; #define SH_MOBILE_SDHI_IRQ_CARD_DETECT "card_detect" #define SH_MOBILE_SDHI_IRQ_SDCARD "sdcard" @@ -26,7 +25,6 @@ struct sh_mobile_sdhi_info { unsigned long tmio_caps2; u32 tmio_ocr_mask; /* available MMC voltages */ unsigned int cd_gpio; - struct tmio_mmc_data *pdata; void (*set_pwr)(struct platform_device *pdev, int state); int (*get_cd)(struct platform_device *pdev);