Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit c91ef5986185c044a853d990670e3f7ce22f2991

Authored by David Gibson
Committed by Paul Mackerras
1 parent 087d7ecd52
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[POWERPC] More DCR native fixups 

Getting BenH's new EMAC driver working on 440GP, I found some more
problems in the native mode paths of the new DCR code:
	- dcr_map() is supposed to return a dcr_host_t, but the native
version is a macro that doesn't expand to an expression.  With native
DCRs, dcr_host_t is an empty structure, so we just use a constructor
expression instead.
	- dcr_unmap() uses {} instead of the safer do {} while (0)
idiom to implement a no-op

Here's a fix.

Signed-off-by: David Gibson <dwg@au1.ibm.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

include/asm-powerpc/dcr-native.h
Diff comments   View file @ c91ef59
... ... @@ -26,8 +26,8 @@
26 26  
27 27 #define DCR_MAP_OK(host) (1)
28 28  
29   -#define dcr_map(dev, dcr_n, dcr_c) {}
30   -#define dcr_unmap(host, dcr_n, dcr_c) {}
  29 +#define dcr_map(dev, dcr_n, dcr_c) ((dcr_host_t){})
  30 +#define dcr_unmap(host, dcr_n, dcr_c) do {} while (0)
31 31 #define dcr_read(host, dcr_n) mfdcr(dcr_n)
32 32 #define dcr_write(host, dcr_n, value) mtdcr(dcr_n, value)
33 33