From: Jonathan Lemon <jonathan.lemon@gmail.com>
To: netdev@vger.kernel.org
Cc: richardcochran@gmail.com, kernel-team@fb.com,
davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com,
edumazet@google.com
Subject: [PATCH net-next v4 02/10] ptp: ocp: Remove #ifdefs around PCI IDs
Date: Thu, 19 May 2022 14:21:45 -0700 [thread overview]
Message-ID: <20220519212153.450437-3-jonathan.lemon@gmail.com> (raw)
In-Reply-To: <20220519212153.450437-1-jonathan.lemon@gmail.com>
These #ifdefs are not required, so remove them.
Suggested-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Jonathan Lemon <jonathan.lemon@gmail.com>
---
drivers/ptp/ptp_ocp.c | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/ptp/ptp_ocp.c b/drivers/ptp/ptp_ocp.c
index 957c0522a02f..d2cdb2a05c36 100644
--- a/drivers/ptp/ptp_ocp.c
+++ b/drivers/ptp/ptp_ocp.c
@@ -20,13 +20,8 @@
#include <linux/mtd/mtd.h>
#include <linux/nvmem-consumer.h>
-#ifndef PCI_VENDOR_ID_FACEBOOK
-#define PCI_VENDOR_ID_FACEBOOK 0x1d9b
-#endif
-
-#ifndef PCI_DEVICE_ID_FACEBOOK_TIMECARD
-#define PCI_DEVICE_ID_FACEBOOK_TIMECARD 0x0400
-#endif
+#define PCI_VENDOR_ID_FACEBOOK 0x1d9b
+#define PCI_DEVICE_ID_FACEBOOK_TIMECARD 0x0400
static struct class timecard_class = {
.owner = THIS_MODULE,
--
2.31.1
next prev parent reply other threads:[~2022-05-19 21:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-19 21:21 [PATCH net-next v4 00/10] ptp: ocp: various updates Jonathan Lemon
2022-05-19 21:21 ` [PATCH net-next v4 01/10] ptp: ocp: 32-bit fixups for pci start address Jonathan Lemon
2022-05-19 21:21 ` Jonathan Lemon [this message]
2022-05-19 21:21 ` [PATCH net-next v4 03/10] ptp: ocp: add Celestica timecard PCI ids Jonathan Lemon
2022-05-19 21:21 ` [PATCH net-next v4 04/10] ptp: ocp: revise firmware display Jonathan Lemon
2022-05-19 21:21 ` [PATCH net-next v4 05/10] ptp: ocp: parameterize input/output sma selectors Jonathan Lemon
2022-05-19 21:21 ` [PATCH net-next v4 06/10] ptp: ocp: constify selectors Jonathan Lemon
2022-05-19 21:21 ` [PATCH net-next v4 07/10] ptp: ocp: vectorize the sma accessor functions Jonathan Lemon
2022-05-19 21:21 ` [PATCH net-next v4 08/10] ptp: ocp: add .init function for sma_op vector Jonathan Lemon
2022-05-19 21:21 ` [PATCH net-next v4 09/10] ptp: ocp: fix PPS source selector debugfs reporting Jonathan Lemon
2022-05-19 21:21 ` [PATCH net-next v4 10/10] ptp: ocp: Add firmware header checks Jonathan Lemon
2022-05-24 18:50 ` [PATCH net-next v4 00/10] ptp: ocp: various updates patchwork-bot+netdevbpf
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=20220519212153.450437-3-jonathan.lemon@gmail.com \
--to=jonathan.lemon@gmail.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=kernel-team@fb.com \
--cc=kuba@kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=richardcochran@gmail.com \
/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).