From patchwork Wed Sep 25 14:19:54 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 20569 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ve0-f199.google.com (mail-ve0-f199.google.com [209.85.128.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B007323A4E for ; Wed, 25 Sep 2013 14:20:10 +0000 (UTC) Received: by mail-ve0-f199.google.com with SMTP id db12sf5458869veb.6 for ; Wed, 25 Sep 2013 07:20:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe:content-type:content-transfer-encoding; bh=RKz/C5wXPdRoq4KYjDhiC4cry3DXmr8KX68tHi+1yi8=; b=h3Kz/jDLPUSiTNLmmsXnckb4TyRo+DqiWF8CFdRwaBOaFGwoP5do6InNYVCkKN3Wen ZA002p3IRC5c1hcIXQXs2qMyeE/6ancLEOkRyNrq0oXAIYIr/sO9goXk/7k0dKWXUnXt /rdFKmn/shZP5U3jg3/jXDudBQs522ZJwAE7uO/vfXinfXvbi/As+Cmq5gjXaaY92FAV DG2SnJ22vgCs6IMU1AS4qt96vyDXXVcr8kOZd95d+uPFMIPwI7G5Y7Nv35VLWvJV0D1A h8ucIUt1FjLl8G4rpvxArKJBeD2Ufrx7Hlh18jMyMQ+MtmgkvKencIoufn53w14nIUgB +sYQ== X-Gm-Message-State: ALoCoQmdRkHocjT1A6xy/uP7qCvKWizWLRXRS2lQXYq3XHNjOIvEmpuHehvLvv7VUmy2GWMmxz0/ X-Received: by 10.236.94.205 with SMTP id n53mr9200706yhf.44.1380118810175; Wed, 25 Sep 2013 07:20:10 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.2.166 with SMTP id 6ls401385qev.69.gmail; Wed, 25 Sep 2013 07:20:10 -0700 (PDT) X-Received: by 10.52.119.228 with SMTP id kx4mr27964990vdb.12.1380118810081; Wed, 25 Sep 2013 07:20:10 -0700 (PDT) Received: from mail-vb0-f41.google.com (mail-vb0-f41.google.com [209.85.212.41]) by mx.google.com with ESMTPS id ee5si9841329vec.2.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 25 Sep 2013 07:20:10 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.41 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.41; Received: by mail-vb0-f41.google.com with SMTP id g17so4594758vbg.0 for ; Wed, 25 Sep 2013 07:20:10 -0700 (PDT) X-Received: by 10.58.134.16 with SMTP id pg16mr12875363veb.21.1380118809986; Wed, 25 Sep 2013 07:20:09 -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.220.174.196 with SMTP id u4csp308096vcz; Wed, 25 Sep 2013 07:20:09 -0700 (PDT) X-Received: by 10.14.246.11 with SMTP id p11mr56300820eer.9.1380118808634; Wed, 25 Sep 2013 07:20:08 -0700 (PDT) Received: from mail-ea0-f170.google.com (mail-ea0-f170.google.com [209.85.215.170]) by mx.google.com with ESMTPS id x42si31651989eea.164.1969.12.31.16.00.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 25 Sep 2013 07:20:08 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.215.170 is neither permitted nor denied by best guess record for domain of linus.walleij@linaro.org) client-ip=209.85.215.170; Received: by mail-ea0-f170.google.com with SMTP id h14so3293058eak.1 for ; Wed, 25 Sep 2013 07:20:08 -0700 (PDT) X-Received: by 10.14.109.201 with SMTP id s49mr4206895eeg.54.1380118807976; Wed, 25 Sep 2013 07:20:07 -0700 (PDT) Received: from localhost.localdomain ([85.235.11.236]) by mx.google.com with ESMTPSA id v8sm15909403eeo.12.1969.12.31.16.00.00 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 25 Sep 2013 07:20:06 -0700 (PDT) From: Linus Walleij To: David Woodhouse , Artem Bityutskiy , linux-mtd@lists.infradead.org Cc: Linus Walleij , stable@vger.kernel.org, Ezequiel Garcia , Daniel Mack , Brian Norris , David Woodhouse Subject: [PATCH] mtd: pxa3xx_nand: fix compilation error Date: Wed, 25 Sep 2013 16:19:54 +0200 Message-Id: <1380118794-846-1-git-send-email-linus.walleij@linaro.org> X-Mailer: git-send-email 1.8.3.1 MIME-Version: 1.0 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linus.walleij@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.41 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: , When building the pxa3xx defconfig without device tree support (i.e. the pxa3xx_defconfig) the build fails like this: drivers/mtd/nand/pxa3xx_nand.c: In function ‘pxa3xx_nand_probe’: drivers/mtd/nand/pxa3xx_nand.c:1325:2: error: implicit declaration of function ‘pxa3xx_nand_get_variant’ [-Werror=implicit-function-declaration] info->variant = pxa3xx_nand_get_variant(pdev); ^ cc1: some warnings being treated as errors make[5]: *** [drivers/mtd/nand/pxa3xx_nand.o] Error 1 make[4]: *** [drivers/mtd/nand] Error 2 make[4]: *** Waiting for unfinished jobs.... Fix it up by returning the PXA variant on non-DT boots. This appears to have been broken since commit c0f3b8643a6fa2461d70760ec49d21d2b031d611 "mtd: nand: pxa3xx: Introduce 'marvell,armada370-nand' compatible string" Cc: stable@vger.kernel.org Cc: Ezequiel Garcia Cc: Daniel Mack Cc: Brian Norris Cc: David Woodhouse Signed-off-by: Linus Walleij --- drivers/mtd/nand/pxa3xx_nand.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 5db900d..e7a403f 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -1285,6 +1285,12 @@ static int pxa3xx_nand_probe_dt(struct platform_device *pdev) return 0; } #else +static enum pxa3xx_nand_variant +pxa3xx_nand_get_variant(struct platform_device *pdev) +{ + return PXA3XX_NAND_VARIANT_PXA; +} + static inline int pxa3xx_nand_probe_dt(struct platform_device *pdev) { return 0;