From patchwork Wed Jan 16 16:54:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 1991821 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 26455DF2F3 for ; Wed, 16 Jan 2013 16:55:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757907Ab3APQzB (ORCPT ); Wed, 16 Jan 2013 11:55:01 -0500 Received: from moutng.kundenserver.de ([212.227.126.171]:62631 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757953Ab3APQyu (ORCPT ); Wed, 16 Jan 2013 11:54:50 -0500 Received: from axis700.grange (dslb-178-006-255-053.pools.arcor-ip.net [178.6.255.53]) by mrelayeu.kundenserver.de (node=mrbap0) with ESMTP (Nemesis) id 0M4Tee-1T1CB22ZMC-00yarw; Wed, 16 Jan 2013 17:54:48 +0100 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id 530CD40BB8; Wed, 16 Jan 2013 17:54:47 +0100 (CET) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1TvWGF-0006mp-11; Wed, 16 Jan 2013 17:54:47 +0100 From: Guennadi Liakhovetski To: linux-mmc@vger.kernel.org Cc: linux-sh@vger.kernel.org, Magnus Damm Subject: [PATCH 08/11] mmc: sh_mobile_sdhi: remove unused .pdata field Date: Wed, 16 Jan 2013 17:54:43 +0100 Message-Id: <1358355286-26029-9-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1358355286-26029-1-git-send-email-g.liakhovetski@gmx.de> References: <1358355286-26029-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:eoI0LLQvbrpO2fuuBym3Pb0e0n18TwCpdlngAJcqM/d 90CBxRaViw4QawA2v4YroZIUTyKT5AUa8+OLQ5eA4qpz5vuR8k fWrlYQ8G7wB2yiagSvCB71eTx1uodygQ1d0l9sqOckKZdPs1MZ ACE45tzMJHzH+g6x+AyqVu1NUwJwwA6R2fB7HYkG4INrMO7Puu Fi04WqCJHBmOAiXsvSuQbzg2zofrd0GeHvPUfaowmdil3goavD vtuoPKkWYnAFIHkfDFGTwWOprXVMSTBPKvkYEJUCmWalzYc3F4 Z854Hn/I/Bw6QaGzKjOxgRny+iHFXve31svj2h9yUUHYqTk/0S xLjljizYh035TVa0gu1nn7Lc8pxlOT3SH7W3q8UOuE4K83ua+H TTCMNrA5HIvlw== 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 fa71b01..f8f6fc7 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);