2018-07-09 06:13:31

by Janani Sankara Babu

Subject: [PATCH] Staging:fwserial Move LINUX_VENDOR_ID to firewire.h

This driver uses the same unregistered vendor id that the
firewire core does (0xd00d1e). Hence it is exposed as a
define in firewire.h.

Signed-off-by:Janani Sankara Babu <[email protected]>
---
drivers/staging/fwserial/fwserial.c | 1 -
include/linux/firewire.h | 2 ++
2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/fwserial/fwserial.c b/drivers/staging/fwserial/fwserial.c
index e8bfe55..f2966f2 100644
--- a/drivers/staging/fwserial/fwserial.c
+++ b/drivers/staging/fwserial/fwserial.c
@@ -21,0 +21,0 @@

#define be32_to_u64(hi, lo) ((u64)be32_to_cpu(hi) << 32 | be32_to_cpu(lo))

-#define LINUX_VENDOR_ID 0xd00d1eU /* same id used in card root directory */
#define FWSERIAL_VERSION 0x00e81cU /* must be unique within LINUX_VENDOR_ID */

/* configurable options */
diff --git a/include/linux/firewire.h b/include/linux/firewire.h
index aec8f30..62cdff1 100644
--- a/include/linux/firewire.h
+++ b/include/linux/firewire.h
@@ -66,2 +66,2 @@
#define CSR_MODEL 0x17
#define CSR_DIRECTORY_ID 0x20

+#define LINUX_VENDOR_ID 0xd00d1eU /* same id used in card root directory */
+
struct fw_csr_iterator {
const u32 *p;
const u32 *end;
--
1.9.1

2018-07-09 07:02:48

by Greg Kroah-Hartman

Subject: Re: [PATCH] Staging:fwserial Move LINUX_VENDOR_ID to firewire.h

On Mon, Jul 09, 2018 at 11:52:30AM -0400, Janani Sankara Babu wrote:
> This driver uses the same unregistered vendor id that the
> firewire core does (0xd00d1e). Hence it is exposed as a
> define in firewire.h.
>
> Signed-off-by:Janani Sankara Babu <[email protected]>
> ---
> drivers/staging/fwserial/fwserial.c | 1 -
> include/linux/firewire.h | 2 ++
> 2 files changed, 2 insertions(+), 1 deletion(-)


staging drivers are supposed to be self-contained. Please work to get
the fwserial driver out of the staging directory before adding stuff
like this to a .h file that everyone includes.

thanks,

greg k-h