Title: [7752] trunk/arch/blackfin: Fix duplication of name for CAN_ERR_MASK in CAN common header and blackfin
- Revision
- 7752
- Author
- bhsong
- Date
- 2009-11-03 04:29:50 -0500 (Tue, 03 Nov 2009)
Log Message
Fix duplication of name for CAN_ERR_MASK in CAN common header and blackfin
same macro CAN_ERR_MASK exists in include/linux/can.h, so namespace our.
But other similar macros are not namespaced, so the fix makes codes look
ugly. It's better for us to namespace all related macros later.
Modified Paths
Diff
Modified: trunk/arch/blackfin/mach-bf537/include/mach/bf537.h (7751 => 7752)
--- trunk/arch/blackfin/mach-bf537/include/mach/bf537.h 2009-11-03 05:53:26 UTC (rev 7751)
+++ trunk/arch/blackfin/mach-bf537/include/mach/bf537.h 2009-11-03 09:29:50 UTC (rev 7752)
@@ -17,7 +17,7 @@
#define EMAC_ERR_MASK (PHYINT | MMCINT | RXFSINT | TXFSINT | WAKEDET | RXDMAERR | TXDMAERR | STMDONE) /* EMAC_SYSTAT */
#define UART_ERR_MASK_STAT1 (0x4) /* UARTx_IIR */
#define UART_ERR_MASK_STAT0 (0x2) /* UARTx_IIR */
-#define CAN_ERR_MASK (EWTIF | EWRIF | EPIF | BOIF | WUIF | UIAIF | AAIF | RMLIF | UCEIF | EXTIF | ADIF) /* CAN_GIF */
+#define BFIN_CAN_ERR_MASK (EWTIF | EWRIF | EPIF | BOIF | WUIF | UIAIF | AAIF | RMLIF | UCEIF | EXTIF | ADIF) /* CAN_GIF */
#define OFFSET_(x) ((x) & 0x0000FFFF)
Modified: trunk/arch/blackfin/mach-common/ints-priority.c (7751 => 7752)
--- trunk/arch/blackfin/mach-common/ints-priority.c 2009-11-03 05:53:26 UTC (rev 7751)
+++ trunk/arch/blackfin/mach-common/ints-priority.c 2009-11-03 09:29:50 UTC (rev 7752)
@@ -321,7 +321,7 @@
irq = IRQ_SPORT1_ERROR;
else if (bfin_read_PPI_STATUS() & PPI_ERR_MASK)
irq = IRQ_PPI_ERROR;
- else if (bfin_read_CAN_GIF() & CAN_ERR_MASK)
+ else if (bfin_read_CAN_GIF() & BFIN_CAN_ERR_MASK)
irq = IRQ_CAN_ERROR;
else if (bfin_read_SPI_STAT() & SPI_ERR_MASK)
irq = IRQ_SPI_ERROR;
@@ -355,7 +355,7 @@
break;
case IRQ_CAN_ERROR:
- bfin_write_CAN_GIS(CAN_ERR_MASK);
+ bfin_write_CAN_GIS(BFIN_CAN_ERR_MASK);
break;
case IRQ_SPI_ERROR:
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
