From patchwork Fri Aug 15 13:02:15 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Griffin X-Patchwork-Id: 35463 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ig0-f200.google.com (mail-ig0-f200.google.com [209.85.213.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id ACE05203C5 for ; Fri, 15 Aug 2014 13:02:47 +0000 (UTC) Received: by mail-ig0-f200.google.com with SMTP id uq10sf4532622igb.7 for ; Fri, 15 Aug 2014 06:02:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=+Hj24Wz4D7Y+R3kMdR2jw0SyTTu+TpRUzzhAb9WYGMk=; b=Emx9AMgdcdUvT1eGMwp4a52dnb6vDAEjrzhBqzY4Ws763Ec01K+/0B6+jOrvCCgL2J Zxdj5Jnbtfr6a7py/c+iXlW5LhZiq7gKfjIHuqnOTmCukItKI2g0c/j6mBI0ejDjetJE kiOoAlO7dswtihsSJBW0fcrtCon01ivO0tyDhM5eENzh7gm1gU/g4zXaAUIAYa+Nsa11 VJZ4rDLgZf2qyU0qWB5yhwMWgnexcVhZXR6TUMMuPToI+eX051/zVPEBG0WrHKd5jPB3 s3Y3JEXmDEl77JsDjwb+xMVz35Xii5elAf+FQEZF7AGp42fdoFnuec0A4oTEDYC404Gc 23zA== X-Gm-Message-State: ALoCoQnmkeQY9Z8Yyipeb7RMx+hIrg0Wl/Ll2367QL0HspdWRpr/AlbCC5bjaWQ2Mzf/lhMpA/yT X-Received: by 10.182.251.135 with SMTP id zk7mr9248654obc.14.1408107767207; Fri, 15 Aug 2014 06:02:47 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.20.134 with SMTP id 6ls1417767qgj.12.gmail; Fri, 15 Aug 2014 06:02:47 -0700 (PDT) X-Received: by 10.229.242.65 with SMTP id lh1mr27652900qcb.18.1408107767090; Fri, 15 Aug 2014 06:02:47 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id x10si11734616qar.30.2014.08.15.06.02.46 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Aug 2014 06:02:46 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id id10so2850725vcb.21 for ; Fri, 15 Aug 2014 06:02:46 -0700 (PDT) X-Received: by 10.220.199.193 with SMTP id et1mr279832vcb.58.1408107766823; Fri, 15 Aug 2014 06:02:46 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp110885vcb; Fri, 15 Aug 2014 06:02:46 -0700 (PDT) X-Received: by 10.194.6.101 with SMTP id z5mr20957355wjz.79.1408107765703; Fri, 15 Aug 2014 06:02:45 -0700 (PDT) Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) by mx.google.com with ESMTPS id b6si11421358wjy.38.2014.08.15.06.02.45 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 15 Aug 2014 06:02:45 -0700 (PDT) Received-SPF: pass (google.com: domain of peter.griffin@linaro.org designates 209.85.212.173 as permitted sender) client-ip=209.85.212.173; Received: by mail-wi0-f173.google.com with SMTP id f8so800833wiw.12 for ; Fri, 15 Aug 2014 06:02:45 -0700 (PDT) X-Received: by 10.194.188.46 with SMTP id fx14mr11992862wjc.112.1408107765266; Fri, 15 Aug 2014 06:02:45 -0700 (PDT) Received: from localhost.localdomain (cpc14-aztw22-2-0-cust189.18-1.cable.virginm.net. [82.45.1.190]) by mx.google.com with ESMTPSA id fs3sm6616268wic.20.2014.08.15.06.02.43 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 15 Aug 2014 06:02:44 -0700 (PDT) From: Peter Griffin To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, chris@printf.net, ulf.hansson@linaro.org, linux-mmc@vger.kernel.org, zhangfei.gao@marvell.com, prakity@marvell.com, rmk+kernel@arm.linux.org.uk Cc: peter.griffin@linaro.org, patches@linaro.org, lee.jones@linaro.org Subject: [PATCH v3] mmc: sdhci-pxav3: set_uhs_signaling is initialized twice differently Date: Fri, 15 Aug 2014 14:02:15 +0100 Message-Id: <1408107735-20775-1-git-send-email-peter.griffin@linaro.org> X-Mailer: git-send-email 1.9.1 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.griffin@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , .set_uhs_signaling field is currently initialised twice once to the arch specific callback pxav3_set_uhs_signaling, and also to the generic sdhci_set_uhs_signaling callback. This means that uhs is currently broken for this platform currently, as pxav3 has some special constriants which means it can't use the generic callback. This happened in commit 96d7b78cfc2f ("mmc: sdhci: convert sdhci_set_uhs_signaling() into a library function") commit a702c8abb2a9 ("mmc: host: split up sdhci-pxa, create sdhci-pxav3.c")' Fix this and hopefully prevent it happening in the future by ensuring named initialisers always follow the declaration order in the structure definition. Signed-off-by: Peter Griffin --- drivers/mmc/host/sdhci-pxav3.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/mmc/host/sdhci-pxav3.c b/drivers/mmc/host/sdhci-pxav3.c index 6f842fb..3434c79 100644 --- a/drivers/mmc/host/sdhci-pxav3.c +++ b/drivers/mmc/host/sdhci-pxav3.c @@ -224,12 +224,11 @@ static void pxav3_set_uhs_signaling(struct sdhci_host *host, unsigned int uhs) static const struct sdhci_ops pxav3_sdhci_ops = { .set_clock = sdhci_set_clock, - .set_uhs_signaling = pxav3_set_uhs_signaling, .platform_send_init_74_clocks = pxav3_gen_init_74_clocks, .get_max_clock = sdhci_pltfm_clk_get_max_clock, .set_bus_width = sdhci_set_bus_width, .reset = pxav3_reset, - .set_uhs_signaling = sdhci_set_uhs_signaling, + .set_uhs_signaling = pxav3_set_uhs_signaling, }; static struct sdhci_pltfm_data sdhci_pxav3_pdata = {