From: Florian Fainelli <f.fainelli@gmail.com>
To: netdev@vger.kernel.org
Cc: davem@davemloft.net, mw@semihalf.com, arnd@arndb.de,
gregory.clement@free-electrons.com, Shaohui.Xie@freescale.com,
Florian Fainelli <f.fainelli@gmail.com>
Subject: [PATCH net-next v2 2/3] net: gianfar_ptp: Rename FS bit to FIPERST
Date: Tue, 15 Nov 2016 16:40:36 -0800 [thread overview]
Message-ID: <20161116004037.20941-5-f.fainelli@gmail.com> (raw)
In-Reply-To: <20161116004037.20941-1-f.fainelli@gmail.com>
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>
---
drivers/net/ethernet/freescale/gianfar_ptp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/freescale/gianfar_ptp.c b/drivers/net/ethernet/freescale/gianfar_ptp.c
index 57798814160d..3e8d1fffe34e 100644
--- a/drivers/net/ethernet/freescale/gianfar_ptp.c
+++ b/drivers/net/ethernet/freescale/gianfar_ptp.c
@@ -72,7 +72,7 @@ struct gianfar_ptp_registers {
/* Bit definitions for the TMR_CTRL register */
#define ALM1P (1<<31) /* Alarm1 output polarity */
#define ALM2P (1<<30) /* Alarm2 output polarity */
-#define FS (1<<28) /* FIPER start indication */
+#define FIPERST (1<<28) /* FIPER start indication */
#define PP1L (1<<27) /* Fiper1 pulse loopback mode enabled. */
#define PP2L (1<<26) /* Fiper2 pulse loopback mode enabled. */
#define TCLK_PERIOD_SHIFT (16) /* 1588 timer reference clock period. */
@@ -502,7 +502,7 @@ static int gianfar_ptp_probe(struct platform_device *dev)
gfar_write(&etsects->regs->tmr_fiper1, etsects->tmr_fiper1);
gfar_write(&etsects->regs->tmr_fiper2, etsects->tmr_fiper2);
set_alarm(etsects);
- gfar_write(&etsects->regs->tmr_ctrl, tmr_ctrl|FS|RTPE|TE|FRD);
+ gfar_write(&etsects->regs->tmr_ctrl, tmr_ctrl|FIPERST|RTPE|TE|FRD);
spin_unlock_irqrestore(&etsects->lock, flags);
--
2.9.3
next prev parent reply other threads:[~2016-11-16 0:40 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-16 0:40 [PATCH net-next v3 0/3] net: ethernet: Allow Marvell & Freescale to COMPILE_TEST Florian Fainelli
2016-11-16 0:40 ` [PATCH net-next v2 1/3] net: fsl: Allow most drivers to be built with COMPILE_TEST Florian Fainelli
2016-11-16 0:40 ` [PATCH net-next v3 1/3] net: gianfar_ptp: Rename FS bit to FIPERST Florian Fainelli
2016-11-16 0:40 ` [PATCH net-next v3 2/3] net: fsl: Allow most drivers to be built with COMPILE_TEST Florian Fainelli
2016-11-16 3:23 ` kbuild test robot
2016-11-16 19:52 ` Florian Fainelli
2016-11-17 1:38 ` Fengguang Wu
2016-11-17 10:47 ` Arnd Bergmann
2016-11-17 16:27 ` David Miller
2016-11-16 0:40 ` Florian Fainelli [this message]
2016-11-16 0:40 ` [PATCH net-next v3 3/3] net: marvell: Allow " Florian Fainelli
2016-11-16 19:04 ` kbuild test robot
2016-11-16 20:06 ` Florian Fainelli
2016-11-16 19:02 ` [PATCH net-next v3 0/3] net: ethernet: Allow Marvell & Freescale to COMPILE_TEST David Miller
2016-11-16 19:07 ` Florian Fainelli
-- strict thread matches above, loose matches on Subject: below --
2016-11-16 0:35 [PATCH net-next v2 " Florian Fainelli
2016-11-16 0:35 ` [PATCH net-next v2 2/3] net: gianfar_ptp: Rename FS bit to FIPERST Florian Fainelli
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161116004037.20941-5-f.fainelli@gmail.com \
--to=f.fainelli@gmail.com \
--cc=Shaohui.Xie@freescale.com \
--cc=arnd@arndb.de \
--cc=davem@davemloft.net \
--cc=gregory.clement@free-electrons.com \
--cc=mw@semihalf.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).