From patchwork Wed Feb 6 19:46:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Guennadi Liakhovetski X-Patchwork-Id: 2106471 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 6AAE43FCFC for ; Wed, 6 Feb 2013 19:47:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751048Ab3BFTrS (ORCPT ); Wed, 6 Feb 2013 14:47:18 -0500 Received: from moutng.kundenserver.de ([212.227.126.171]:55148 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757989Ab3BFTrP (ORCPT ); Wed, 6 Feb 2013 14:47:15 -0500 Received: from axis700.grange (dslb-178-006-240-079.pools.arcor-ip.net [178.6.240.79]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0Lyfid-1Uz4vO2R2V-016Am7; Wed, 06 Feb 2013 20:47:05 +0100 Received: from 6a.grange (6a.grange [192.168.1.11]) by axis700.grange (Postfix) with ESMTPS id B6AB840BC3; Wed, 6 Feb 2013 20:47:04 +0100 (CET) Received: from lyakh by 6a.grange with local (Exim 4.72) (envelope-from ) id 1U3AxU-0004qM-J5; Wed, 06 Feb 2013 20:47:04 +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 , Guennadi Liakhovetski Subject: [PATCH v3 08/13] mmc: sh_mobile_sdhi: remove unused .pdata field Date: Wed, 6 Feb 2013 20:46:55 +0100 Message-Id: <1360180020-18555-9-git-send-email-g.liakhovetski@gmx.de> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1360180020-18555-1-git-send-email-g.liakhovetski@gmx.de> References: <1360180020-18555-1-git-send-email-g.liakhovetski@gmx.de> X-Provags-ID: V02:K0:cg48ughWPD3L2k4G629gJ7/rCpsYFshK0mHtoiVz87W qHqv7uJEngYgnR80at0gpYln6jFkmkBAF5b1jt3X1fHpKONEtg IVtXpuKdMreua16RFhcgBH+I/3pc155mbevEig1A9agSJLPRos 9wZuo3kdrKOOtjwPOKgz2xsAfCWB/IBrptT1/mm0p6+g5ZG0d3 DUpxKTjHKiA++Ezq03kp3JvZDP7pyJg7uKLb5nXvc8RuAqxVnG 22doBm/6sXKMSWLzGEr25sMRw5ffPLh2qQUXuNFPPG8csaL5b1 aFI1RI2lM21fIFyVCu4/bqfcTlr3NjsYpgVEkufjx/1GrN6JCc YCKN8+TF/IB/QmhxgjO8dEBmiVEMarYcTfj72XILfOlrDzDjF/ tpdTWR2IB2TDA== 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);