Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

net: gianfar_ptp: Rename FS bit to FIPERST

FS is a global symbol used by the x86 32-bit architecture, fixes builds
re-definitions:

>> drivers/net/ethernet/freescale/gianfar_ptp.c:75:0: warning: "FS"
>> redefined
#define FS (1<<28) /* FIPER start indication */

In file included from arch/x86/include/uapi/asm/ptrace.h:5:0,
from arch/x86/include/asm/ptrace.h:6,
from arch/x86/include/asm/math_emu.h:4,
from arch/x86/include/asm/processor.h:11,
from include/linux/mutex.h:19,
from include/linux/kernfs.h:13,
from include/linux/sysfs.h:15,
from include/linux/kobject.h:21,
from include/linux/device.h:17,
from
drivers/net/ethernet/freescale/gianfar_ptp.c:23:
arch/x86/include/uapi/asm/ptrace-abi.h:15:0: note: this is the
location of the previous definition
#define FS 9

Reported-by: kbuild test robot <lkp@intel.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Florian Fainelli and committed by
David S. Miller
00a19e55 5a4e4c8f

+2 -2
+2 -2
drivers/net/ethernet/freescale/gianfar_ptp.c
··· 72 72 /* Bit definitions for the TMR_CTRL register */ 73 73 #define ALM1P (1<<31) /* Alarm1 output polarity */ 74 74 #define ALM2P (1<<30) /* Alarm2 output polarity */ 75 - #define FS (1<<28) /* FIPER start indication */ 75 + #define FIPERST (1<<28) /* FIPER start indication */ 76 76 #define PP1L (1<<27) /* Fiper1 pulse loopback mode enabled. */ 77 77 #define PP2L (1<<26) /* Fiper2 pulse loopback mode enabled. */ 78 78 #define TCLK_PERIOD_SHIFT (16) /* 1588 timer reference clock period. */ ··· 502 502 gfar_write(&etsects->regs->tmr_fiper1, etsects->tmr_fiper1); 503 503 gfar_write(&etsects->regs->tmr_fiper2, etsects->tmr_fiper2); 504 504 set_alarm(etsects); 505 - gfar_write(&etsects->regs->tmr_ctrl, tmr_ctrl|FS|RTPE|TE|FRD); 505 + gfar_write(&etsects->regs->tmr_ctrl, tmr_ctrl|FIPERST|RTPE|TE|FRD); 506 506 507 507 spin_unlock_irqrestore(&etsects->lock, flags); 508 508