From patchwork Wed Jan 23 15:32:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2025461 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 382033FD86 for ; Wed, 23 Jan 2013 15:40:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756038Ab3AWPkT (ORCPT ); Wed, 23 Jan 2013 10:40:19 -0500 Received: from moutng.kundenserver.de ([212.227.126.171]:57746 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755551Ab3AWPkS (ORCPT ); Wed, 23 Jan 2013 10:40:18 -0500 Received: from axis700.grange (dslb-178-006-250-035.pools.arcor-ip.net [178.6.250.35]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0MOYWP-1U3pKf1jE5-005n0d; Wed, 23 Jan 2013 16:40:16 +0100 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id D1BD440BC5; Wed, 23 Jan 2013 16:40:14 +0100 (CET) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1Ty2Qw-0000Pv-JS; Wed, 23 Jan 2013 16:40:14 +0100 From: Guennadi Liakhovetski To: linux-mmc@vger.kernel.org Cc: linux-sh@vger.kernel.org, Magnus Damm , Chris Ball , Guennadi Liakhovetski Subject: [PATCH v2 08/11] mmc: sh_mobile_sdhi: remove unused .pdata field Date: Wed, 23 Jan 2013 16:32:35 +0100 Message-Id: <1358955158-1510-9-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1358955158-1510-1-git-send-email-g.liakhovetski@gmx.de> References: <1358955158-1510-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:5kdLJ3+zA4GcvebEyrI2gSUDO0gwq0sjesMtGn0d0NA Rg1atgBAuebaycnSzQn7X8+YzmQfN/ioxKKw81w5+QNYbg3zVx lWdBhMwvsEDbCjZZie8T8v4aBs+Eyl3uw5iHElWH2Kwr7IBLP0 +IU5nvquA0x3Ijf/m83PSZbOls81DNCxtwgNvSpMY6pQk6Fhab s6HXQAZO/3lAxWuoYLVJyKb+AuIvswYBE9MmmlQtMRRtWYHvbe bDJpmEalzTD7x0edTB5QUfxxWsdxnjJ125HWl81dhEWolKJKPa 2wqU0zGDYmM1yeuMRnyWL1gHETXG5AzK3MSfKV2WCwp3kgFyI3 g7MjGn3435XzZI+lwhHyXlrvRRqh4y7p3Hsie5iWtz2qBH7omM mAvKBUq3P86xA== 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 e0ca0ab..17d5778 100644 --- a/drivers/mmc/host/sh_mobile_sdhi.c +++ b/drivers/mmc/host/sh_mobile_sdhi.c @@ -135,7 +135,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) @@ -284,9 +283,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);