| Message ID | 1378916185-19738-1-git-send-email-ezequiel.garcia@free-electrons.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Sep 11, 2013 at 9:16 AM, Ezequiel Garcia <ezequiel.garcia@free-electrons.com> wrote: > This commit adds a dummy pxa3xx_nand_get_variant() stub, to fix > this build error (with pxa3xx_defconfig or similar): > > drivers/mtd/nand/pxa3xx_nand.c:1325:2: error: implicit declaration of > function 'pxa3xx_nand_get_variant' [-Werror=implicit-function-declaration] > > Cc: Brian Norris <computersforpeace@gmail.com> > Cc: David Woodhouse <dwmw2@infradead.org> > Cc: Olof Johansson <olof@lixom.net> > Cc: Kevin Hilman <khilman@linaro.org> > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Nack. This has already been fixed by you(!), Brian is just sitting on the patch and not sending it up for some reason. Brian? -Olof
On Wed, Sep 11, 2013 at 09:27:11AM -0700, Olof Johansson wrote: > On Wed, Sep 11, 2013 at 9:16 AM, Ezequiel Garcia > <ezequiel.garcia@free-electrons.com> wrote: > > This commit adds a dummy pxa3xx_nand_get_variant() stub, to fix > > this build error (with pxa3xx_defconfig or similar): > > > > drivers/mtd/nand/pxa3xx_nand.c:1325:2: error: implicit declaration of > > function 'pxa3xx_nand_get_variant' [-Werror=implicit-function-declaration] > > > > Cc: Brian Norris <computersforpeace@gmail.com> > > Cc: David Woodhouse <dwmw2@infradead.org> > > Cc: Olof Johansson <olof@lixom.net> > > Cc: Kevin Hilman <khilman@linaro.org> > > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > > Nack. This has already been fixed by you(!), Brian is just sitting on > the patch and not sending it up for some reason. Brian? First, Ezequiel, please CC linux-mtd when you send MTD patches. This didn't show up in my Maintainer inbox because I'm not an ARM maintainer (but you *did* CC their list) :) Second, David hasn't authorized me to send pull requests, so I'm just queueing things up for him. I don't know why David removed this patch (among a few others) from his pull request. David, the following commit (currently in l2-mtd.git) was a dependency for the rest of the pxa3xx series you just sent upstream. You (inadvertently?) left it out when you rebased. Please send a pull request for 3.12-rcX with at least this patch: commit c4287efe67c298b1304c613093371103ac1bbb98 Author: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Date: Mon Aug 12 14:14:46 2013 -0300 mtd: nand: pxa3xx: Remove unneeded ifdef CONFIG_OF There's no need to enclose this code within idef CONFIG_OF, because the OF framework provides no-op stubs if CONFIG_OF=n. Cc: devicetree@vger.kernel.org Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> Signed-off-by: Brian Norris <computersforpeace@gmail.com> Brian
On Wed, Sep 11, 2013 at 01:58:49PM -0700, Brian Norris wrote: > On Wed, Sep 11, 2013 at 09:27:11AM -0700, Olof Johansson wrote: > > On Wed, Sep 11, 2013 at 9:16 AM, Ezequiel Garcia > > <ezequiel.garcia@free-electrons.com> wrote: > > > This commit adds a dummy pxa3xx_nand_get_variant() stub, to fix > > > this build error (with pxa3xx_defconfig or similar): > > > > > > drivers/mtd/nand/pxa3xx_nand.c:1325:2: error: implicit declaration of > > > function 'pxa3xx_nand_get_variant' [-Werror=implicit-function-declaration] > > > > > > Cc: Brian Norris <computersforpeace@gmail.com> > > > Cc: David Woodhouse <dwmw2@infradead.org> > > > Cc: Olof Johansson <olof@lixom.net> > > > Cc: Kevin Hilman <khilman@linaro.org> > > > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > > > > Nack. This has already been fixed by you(!), Brian is just sitting on > > the patch and not sending it up for some reason. Brian? > > First, Ezequiel, please CC linux-mtd when you send MTD patches. This > didn't show up in my Maintainer inbox because I'm not an ARM maintainer > (but you *did* CC their list) :) > Argh! Sorry about that. I cooked the above one in a rush. > Second, David hasn't authorized me to send pull requests, so I'm just > queueing things up for him. I don't know why David removed this patch > (among a few others) from his pull request. > As you may recall, we did the below patch because you (correctly) noticed it was possible to avoid the ifdef. It also fixed the build break, but nobody noticed that until just now, so nobody reported the patch was actually a fix. So, I guess David considered it was a less urgent fix and decided to postpone it. > David, the following commit (currently in l2-mtd.git) was a dependency > for the rest of the pxa3xx series you just sent upstream. You > (inadvertently?) left it out when you rebased. Please send a pull > request for 3.12-rcX with at least this patch: > > commit c4287efe67c298b1304c613093371103ac1bbb98 > Author: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > Date: Mon Aug 12 14:14:46 2013 -0300 > > mtd: nand: pxa3xx: Remove unneeded ifdef CONFIG_OF > > There's no need to enclose this code within idef CONFIG_OF, > because the OF framework provides no-op stubs if CONFIG_OF=n. > > Cc: devicetree@vger.kernel.org > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > Signed-off-by: Brian Norris <computersforpeace@gmail.com> >
On Wed, Sep 11, 2013 at 06:23:01PM -0300, Ezequiel Garcia wrote: > On Wed, Sep 11, 2013 at 01:58:49PM -0700, Brian Norris wrote: > > On Wed, Sep 11, 2013 at 09:27:11AM -0700, Olof Johansson wrote: > > > On Wed, Sep 11, 2013 at 9:16 AM, Ezequiel Garcia > > > <ezequiel.garcia@free-electrons.com> wrote: > > > > This commit adds a dummy pxa3xx_nand_get_variant() stub, to fix > > > > this build error (with pxa3xx_defconfig or similar): > > > > > > > > drivers/mtd/nand/pxa3xx_nand.c:1325:2: error: implicit declaration of > > > > function 'pxa3xx_nand_get_variant' [-Werror=implicit-function-declaration] > > > > > > > > Cc: Brian Norris <computersforpeace@gmail.com> > > > > Cc: David Woodhouse <dwmw2@infradead.org> > > > > Cc: Olof Johansson <olof@lixom.net> > > > > Cc: Kevin Hilman <khilman@linaro.org> > > > > Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> > > > > > > Nack. This has already been fixed by you(!), Brian is just sitting on > > > the patch and not sending it up for some reason. Brian? ... > > Second, David hasn't authorized me to send pull requests, so I'm just > > queueing things up for him. I don't know why David removed this patch > > (among a few others) from his pull request. > > As you may recall, we did the below patch because you (correctly) noticed > it was possible to avoid the ifdef. It also fixed the build break, but nobody > noticed that until just now, so nobody reported the patch was actually a fix. Well, your series originally defined this stub function before I recommended a change to drop the CONFIG_OF check. See your v2 patch: http://lists.infradead.org/pipermail/linux-mtd/2013-August/047863.html So there never was a build breakage until David rebased; the patch was just a dependent part of the series that should never have been postponed. Brian
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 5db900d..240a239 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c @@ -1289,6 +1289,12 @@ static inline int pxa3xx_nand_probe_dt(struct platform_device *pdev) { return 0; } + +static inline enum pxa3xx_nand_variant +pxa3xx_nand_get_variant(struct platform_device *pdev) +{ + return PXA3XX_NAND_VARIANT_PXA; +} #endif static int pxa3xx_nand_probe(struct platform_device *pdev)
This commit adds a dummy pxa3xx_nand_get_variant() stub, to fix this build error (with pxa3xx_defconfig or similar): drivers/mtd/nand/pxa3xx_nand.c:1325:2: error: implicit declaration of function 'pxa3xx_nand_get_variant' [-Werror=implicit-function-declaration] Cc: Brian Norris <computersforpeace@gmail.com> Cc: David Woodhouse <dwmw2@infradead.org> Cc: Olof Johansson <olof@lixom.net> Cc: Kevin Hilman <khilman@linaro.org> Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> --- drivers/mtd/nand/pxa3xx_nand.c | 6 ++++++ 1 file changed, 6 insertions(+)