diff options
| author | Scott Wood <scottwood@freescale.com> | 2014-04-08 01:08:34 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-04-18 19:20:37 (GMT) |
| commit | 76192fa2b608ee7af61ab9dc865098a60c5d9973 (patch) | |
| tree | e2a322d0d05f999bcd63e0021cd30dc1230a7299 /drivers/net/ethernet/freescale/fman/inc | |
| parent | 005e855f53957216f57547d0df8ea691556e2cb8 (diff) | |
| download | linux-fsl-qoriq-76192fa2b608ee7af61ab9dc865098a60c5d9973.tar.xz | |
fman: don't redefine NO_IRQ
This triggered a warning on the v3.12 merge. Redefining standard
kernel symbols is *wrong*. Don't do it.
FWIW, NO_IRQ is deprecated and should not be used at all. Use zero.
I tried removing this redefinition entirely, but that caused a build
failure. I tried adding an #include of the relevant Linux header from
drivers/net/ethernet/freescale/fman/src/inc/types_linux.h which AFAICT
is the place for Linux dependencies, but it still wasn't getting
included so I gave up and defined it to the same exact thing as Linux.
Note that while this warning did not appear on v3.13-rc3 (presumably
due to headers being included in different order), there are lots of
warnings about "fm_port_suspend missing" both before and after moving
to 3.12. Please fix these. Warnings should be treated as errors, not
ignored.
Signed-off-by: Scott Wood <scottwood@freescale.com>
Change-Id: I18e8d71ed8a9494547cb0a2b7dca475deb26c030
Reviewed-on: http://git.am.freescale.net:8181/10770
Tested-by: Review Code-CDREVIEW <CDREVIEW@freescale.com>
Reviewed-by: Kim Phillips <Kim.Phillips@freescale.com>
Reviewed-by: Madalin-Cristian Bucur <madalin.bucur@freescale.com>
Diffstat (limited to 'drivers/net/ethernet/freescale/fman/inc')
| -rw-r--r-- | drivers/net/ethernet/freescale/fman/inc/ncsw_ext.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/ethernet/freescale/fman/inc/ncsw_ext.h b/drivers/net/ethernet/freescale/fman/inc/ncsw_ext.h index c3341cd..e7964ad 100644 --- a/drivers/net/ethernet/freescale/fman/inc/ncsw_ext.h +++ b/drivers/net/ethernet/freescale/fman/inc/ncsw_ext.h @@ -101,8 +101,9 @@ #define GIGABYTE ((uint64_t)(KILOBYTE * MEGABYTE)) /* 1024*1024*1024 */ #define TERABYTE ((uint64_t)(KILOBYTE * GIGABYTE)) /* 1024*1024*1024*1024 */ -#undef NO_IRQ -#define NO_IRQ (-1) +#ifndef NO_IRQ +#define NO_IRQ (0) +#endif #define NCSW_MASTER_ID (0) /* Macro for checking if a number is a power of 2 */ |