From patchwork Thu Nov 8 14:26:11 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 1716141 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 9F14BDF280 for ; Thu, 8 Nov 2012 14:26:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755982Ab2KHO0S (ORCPT ); Thu, 8 Nov 2012 09:26:18 -0500 Received: from moutng.kundenserver.de ([212.227.17.8]:65084 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755976Ab2KHO0R (ORCPT ); Thu, 8 Nov 2012 09:26:17 -0500 Received: from klappe2.localnet (deibp9eh1--blueice3n2.emea.ibm.com [195.212.29.180]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0LblNw-1T74TK3q3o-00jIah; Thu, 08 Nov 2012 15:26:15 +0100 From: Arnd Bergmann To: Chris Ball Subject: [PATCH] dw_mmc: fix more const pointer warnings Date: Thu, 8 Nov 2012 14:26:11 +0000 User-Agent: KMail/1.12.2 (Linux/3.5.0; KDE/4.3.2; x86_64; ; ) Cc: James Hogan , Will Newton , Jaehoon Chung , Thomas Abraham , Seungwon Jeon , linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org References: <1350376988-27477-1-git-send-email-james.hogan@imgtec.com> <508E4DB6.20504@imgtec.com> <87a9v5xuqj.fsf@octavius.laptop.org> In-Reply-To: <87a9v5xuqj.fsf@octavius.laptop.org> MIME-Version: 1.0 Message-Id: <201211081426.12208.arnd@arndb.de> X-Provags-ID: V02:K0:MLS+KMOfo/e/iRbKeQieCCg9llHimLPn5Xk+0SQRJ5W KmUjcv1k5WFwkdwUYTl9BF62nxzkhiNYMTd9pnbXjl3bamfj5D 62B8H4I6emQhL8YHxtYoeVcYa7clfRymj3htAMcmazYrQWQ+8o Sr+l1AS+QCHKMjHVZDcyeLkL2zrzhk3u+1wa2SmqTK8e9Ov9ng 1Ex93YCsP2c5W+3hS6MrggEXJD6vTPHId1o2cZF/ITpFDryEJK 8UTwb0+lqDSxEi+Mcv/0flCI8jbOSZ2hXQmxUyo3F9zKFbQfEv SoJ/dJgB63JEXH+wBHCbL8msMgax2+gMRXrDliiaFhWGO50rBg ScLiwbdvxfZ/gAtCEaRA= Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org The patch "dw_mmc: fix multiple drv_data NULL dereferences" has unfortunately clashed with my "mmc: dw_mmc: constify dw_mci_idmac_ops in exynos back-end" patch, causing new warnings to appear. This should hopefully fix the issue for good. Signed-off-by: Arnd Bergmann --- On Monday 29 October 2012, Chris Ball wrote: > Hi, > > On Mon, Oct 29 2012, James Hogan wrote: > > On 17/10/12 10:11, Will Newton wrote: > >> Looks good to me too. > >> > >> Acked-by: Will Newton > >> > >> On Wed, Oct 17, 2012 at 3:06 AM, Jaehoon Chung wrote: > >>> Looks good to me. > >>> > >>> Acked-by: Jaehoon Chung > > > > Thanks for the acks Thomas, Seungwon, Jaehoon and Will. > > > > Chris: Any chance of queueing this patch for v3.7? > > Yes, certainly -- pushed to mmc-next for 3.7, thanks. -- To unsubscribe from this list: send the line "unsubscribe linux-mmc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index c0667c8..5b41348 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -232,7 +232,7 @@ static u32 dw_mci_prepare_command(struct mmc_host *mmc, struct mmc_command *cmd) { struct mmc_data *data; struct dw_mci_slot *slot = mmc_priv(mmc); - struct dw_mci_drv_data *drv_data = slot->host->drv_data; + const struct dw_mci_drv_data *drv_data = slot->host->drv_data; u32 cmdr; cmd->error = -EINPROGRESS; @@ -773,7 +773,7 @@ static void dw_mci_request(struct mmc_host *mmc, struct mmc_request *mrq) static void dw_mci_set_ios(struct mmc_host *mmc, struct mmc_ios *ios) { struct dw_mci_slot *slot = mmc_priv(mmc); - struct dw_mci_drv_data *drv_data = slot->host->drv_data; + const struct dw_mci_drv_data *drv_data = slot->host->drv_data; u32 regs; /* set default 1 bit mode */ @@ -1817,7 +1817,7 @@ static int dw_mci_init_slot(struct dw_mci *host, unsigned int id) { struct mmc_host *mmc; struct dw_mci_slot *slot; - struct dw_mci_drv_data *drv_data = host->drv_data; + const struct dw_mci_drv_data *drv_data = host->drv_data; int ctrl_id, ret; u8 bus_width; @@ -2038,7 +2038,7 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) struct dw_mci_board *pdata; struct device *dev = host->dev; struct device_node *np = dev->of_node; - struct dw_mci_drv_data *drv_data = host->drv_data; + const struct dw_mci_drv_data *drv_data = host->drv_data; int idx, ret; pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL); @@ -2084,7 +2084,7 @@ static struct dw_mci_board *dw_mci_parse_dt(struct dw_mci *host) int dw_mci_probe(struct dw_mci *host) { - struct dw_mci_drv_data *drv_data = host->drv_data; + const struct dw_mci_drv_data *drv_data = host->drv_data; int width, i, ret = 0; u32 fifo_size; int init_slots = 0;