From patchwork Mon Sep 22 11:55:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Fenkart X-Patchwork-Id: 4947531 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 C8B02BEEA5 for ; Mon, 22 Sep 2014 11:55:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 3101A20149 for ; Mon, 22 Sep 2014 11:55:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 09BD52013D for ; Mon, 22 Sep 2014 11:55:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753766AbaIVLzj (ORCPT ); Mon, 22 Sep 2014 07:55:39 -0400 Received: from mail-we0-f169.google.com ([74.125.82.169]:60513 "EHLO mail-we0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753674AbaIVLzh (ORCPT ); Mon, 22 Sep 2014 07:55:37 -0400 Received: by mail-we0-f169.google.com with SMTP id k48so2768654wev.14 for ; Mon, 22 Sep 2014 04:55:36 -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=yMEFR5HoHqIj5kxKZUoy6l4NjwG6IecpPIsW/zdstTg=; b=gJ4LhtfwbkJHGS8cXVxdy06rbP6sIquNnw1wvcLHi+BGmOFAFhrB6DPzWzu7eVT0jZ nA2aQ8yef/lCpsBe8lPE777Hy+8Ey2STDu3+3pNI1Tp//3uba8XVVUZRkEZfU7B/QH2T GWFW4UxhND15DWhwyDdfrgm8mLpuQUulsc9F11b9+2lL/PIii/9TlHvrQyvyStVjxvA8 OnHxCwkBHaWOCwmd9hMZ8rmfUo/O405lRthKffz+WNCxwYEsmvfSJswE839HWAKhqzEt yG5mYr+U2b6iiFu7ZEGYcPXXdHTFHrTujH0gH/+NU2QoZQma3ebGwezoU39YcxkXzzCX x2Zw== X-Received: by 10.194.58.148 with SMTP id r20mr20584218wjq.66.1411386936368; Mon, 22 Sep 2014 04:55:36 -0700 (PDT) Received: from localhost (ip-89-176-190-46.net.upcbroadband.cz. [89.176.190.46]) by mx.google.com with ESMTPSA id ew1sm12049596wjb.31.2014.09.22.04.55.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 22 Sep 2014 04:55:35 -0700 (PDT) From: Andreas Fenkart To: linux-mmc@vger.kernel.org Cc: linux-omap@vger.kernel.org, Tony Lindgren , Balaji T K , Ulf Hansson , pascal.huerst@gmail.com, Andreas Fenkart Subject: [PATCH 5/6] omap_hsmmc: remove un-initialized callbacks from platform data Date: Mon, 22 Sep 2014 13:55:10 +0200 Message-Id: <1411386911-8158-6-git-send-email-afenkart@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1411386911-8158-1-git-send-email-afenkart@gmail.com> References: <1411386911-8158-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.8 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=unavailable 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 Signed-off-by: Andreas Fenkart --- drivers/mmc/host/omap_hsmmc.c | 15 +-------------- include/linux/platform_data/hsmmc-omap.h | 8 -------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c index 02f3438..465c34e 100644 --- a/drivers/mmc/host/omap_hsmmc.c +++ b/drivers/mmc/host/omap_hsmmc.c @@ -2195,18 +2195,10 @@ static int omap_hsmmc_probe(struct platform_device *pdev) goto err_irq; } - if (pdata->init != NULL) { - if (pdata->init(&pdev->dev) != 0) { - dev_err(mmc_dev(host->mmc), - "Unable to configure MMC IRQs\n"); - goto err_irq; - } - } - if (omap_hsmmc_have_reg() && !mmc_slot(host).set_power) { ret = omap_hsmmc_reg_get(host); if (ret) - goto err_reg; + goto err_irq; host->use_reg = 1; } @@ -2269,9 +2261,6 @@ err_slot_name: err_irq_cd: if (host->use_reg) omap_hsmmc_reg_put(host); -err_reg: - if (host->pdata->cleanup) - host->pdata->cleanup(&pdev->dev); err_irq: if (host->tx_chan) dma_release_channel(host->tx_chan); @@ -2297,8 +2286,6 @@ static int omap_hsmmc_remove(struct platform_device *pdev) mmc_remove_host(host->mmc); if (host->use_reg) omap_hsmmc_reg_put(host); - if (host->pdata->cleanup) - host->pdata->cleanup(&pdev->dev); if (host->tx_chan) dma_release_channel(host->tx_chan); diff --git a/include/linux/platform_data/hsmmc-omap.h b/include/linux/platform_data/hsmmc-omap.h index 28b8cff..066075c 100644 --- a/include/linux/platform_data/hsmmc-omap.h +++ b/include/linux/platform_data/hsmmc-omap.h @@ -45,14 +45,6 @@ struct omap_hsmmc_platform_data { * maximum frequency on the MMC bus */ unsigned int max_freq; - /* switch the bus to a new slot */ - int (*switch_slot)(struct device *dev, int slot); - /* initialize board-specific MMC functionality, can be NULL if - * not supported */ - int (*init)(struct device *dev); - void (*cleanup)(struct device *dev); - void (*shutdown)(struct device *dev); - /* To handle board related suspend/resume functionality for MMC */ int (*suspend)(struct device *dev, int slot); int (*resume)(struct device *dev, int slot);