Message-ID: <52D188DA.6020904@pengutronix.de>
Date: Sat, 11 Jan 2014 19:09:30 +0100
From: Marc Kleine-Budde <mkl@pengutronix.de>
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20131103 Icedove/17.0.10
MIME-Version: 1.0
To: Mike Frysinger <vapier@gentoo.org>
CC: uclinux-dist-devel@blackfin.uclinux.org,
        LKML <linux-kernel@vger.kernel.org>, dmaengine@vger.kernel.org
Subject: blackfin + dmaengine: conflicting define/enum "DMA_COMPLETE"
Content-Type: multipart/signed; micalg=pgp-sha1;
 protocol="application/pgp-signature";
 boundary="UejLngAmEUxIJW3u6G98AGcAaXkTuUBBj"
Sender: linux-kernel-owner@vger.kernel.org

This is an OpenPGP/MIME signed message (RFC 4880 and 3156)
--UejLngAmEUxIJW3u6G98AGcAaXkTuUBBj
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable

Hello,

in current linux-next (and net-next) the compilation of the CAN
drivers[1] with ARCH=3Dblackfin fails with:

>   CC [M]  drivers/net/can/c_can/c_can.o
> In file included from linux/include/linux/netdevice.h:38:0,
>                  from linux/drivers/net/can/c_can/c_can.c:32:
> linux/include/linux/dmaengine.h:55:2: error: expected identifier before=
 numeric constant
> linux/include/linux/dmaengine.h: In function 'dma_async_is_complete':
> linux/include/linux/dmaengine.h:1023:9: error: 'DMA_IN_PROGRESS' undecl=
ared (first use in this function)
> linux/include/linux/dmaengine.h:1023:9: note: each undeclared identifie=
r is reported only once for each function it appears in

There are two locations where DMA_COMPLETE is defined:

> arch/blackfin/mach-bf548/include/mach/defBF547.h:602:#define           =
   DMA_COMPLETE  0x8        /* DMA Complete */
> arch/blackfin/mach-bf548/include/mach/defBF544.h:622:#define           =
   DMA_COMPLETE  0x8        /* DMA Complete */

and

> include/linux/dmaengine.h-enum dma_status {
> include/linux/dmaengine.h:      DMA_COMPLETE,
> include/linux/dmaengine.h-      DMA_IN_PROGRESS,
> include/linux/dmaengine.h-      DMA_PAUSED,
> include/linux/dmaengine.h-      DMA_ERROR,
> include/linux/dmaengine.h-};

What's the appropriate fix for the problem?

Marc

[1] Yes, c_can isn't a blackfin driver, but it's the first one in my
    compile tests and it fails.
--=20
Pengutronix e.K.                  | Marc Kleine-Budde           |
Industrial Linux Solutions        | Phone: +49-231-2826-924     |
Vertretung West/Dortmund          | Fax:   +49-5121-206917-5555 |
Amtsgericht Hildesheim, HRA 2686  | http://www.pengutronix.de   |


--UejLngAmEUxIJW3u6G98AGcAaXkTuUBBj
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: OpenPGP digital signature
Content-Disposition: attachment; filename="signature.asc"

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.15 (GNU/Linux)
Comment: Using GnuPG with Icedove - http://www.enigmail.net/

iEYEARECAAYFAlLRiN0ACgkQjTAFq1RaXHNmQACff00DewAZDQ20tz62dIQIszlC
584AmwUydKTzi7JoUfYoRzNMd122NCmM
=Wr7p
-----END PGP SIGNATURE-----

--UejLngAmEUxIJW3u6G98AGcAaXkTuUBBj--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/