2015-02-17 01:46:37

by Joseph Kogut

Subject: [PATCH] usb: move definition of PCI_VENDOR_ID_SYNOPSYS to linux/pci_ids.h

Signed-off-by: Joseph Kogut <[email protected]>
---
drivers/usb/dwc2/pci.c | 1 -
drivers/usb/dwc3/dwc3-pci.c | 2 --
include/linux/pci_ids.h | 2 ++
3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/dwc2/pci.c b/drivers/usb/dwc2/pci.c
index a4e724b..6646adb 100644
--- a/drivers/usb/dwc2/pci.c
+++ b/drivers/usb/dwc2/pci.c
@@ -54,7 +54,6 @@
#include "core.h"
#include "hcd.h"

-#define PCI_VENDOR_ID_SYNOPSYS 0x16c3
#define PCI_PRODUCT_ID_HAPS_HSOTG 0xabc0

static const char dwc2_driver_name[] = "dwc2";
diff --git a/drivers/usb/dwc3/dwc3-pci.c b/drivers/usb/dwc3/dwc3-pci.c
index 8d95056..b773fb5 100644
--- a/drivers/usb/dwc3/dwc3-pci.c
+++ b/drivers/usb/dwc3/dwc3-pci.c
@@ -24,8 +24,6 @@

#include "platform_data.h"

-/* FIXME define these in <linux/pci_ids.h> */
-#define PCI_VENDOR_ID_SYNOPSYS 0x16c3
#define PCI_DEVICE_ID_SYNOPSYS_HAPSUSB3 0xabcd
#define PCI_DEVICE_ID_INTEL_BYT 0x0f37
#define PCI_DEVICE_ID_INTEL_MRFLD 0x119e
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index e63c02a..38cff8f 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2315,6 +2315,8 @@
#define PCI_VENDOR_ID_CENATEK 0x16CA
#define PCI_DEVICE_ID_CENATEK_IDE 0x0001

+#define PCI_VENDOR_ID_SYNOPSYS 0x16c3
+
#define PCI_VENDOR_ID_VITESSE 0x1725
#define PCI_DEVICE_ID_VITESSE_VSC7174 0x7174

--
2.3.0

2015-02-17 01:57:27

by Greg Kroah-Hartman

Subject: Re: [PATCH] usb: move definition of PCI_VENDOR_ID_SYNOPSYS to linux/pci_ids.h

On Mon, Feb 16, 2015 at 06:45:53PM -0700, Joseph Kogut wrote:
> Signed-off-by: Joseph Kogut <[email protected]>

You need a changelog description here please.

2015-02-17 02:16:50

by Joseph Kogut

Subject: Re: [PATCH] usb: move definition of PCI_VENDOR_ID_SYNOPSYS to linux/pci_ids.h

On Mon, 2015-02-16 at 17:57 -0800, Greg KH wrote:
> On Mon, Feb 16, 2015 at 06:45:53PM -0700, Joseph Kogut wrote:
> > Signed-off-by: Joseph Kogut <[email protected]>
>
> You need a changelog description here please.
>

Should I reply inline, or is resending the patch okay?

2015-02-17 02:24:33

by Greg Kroah-Hartman

Subject: Re: [PATCH] usb: move definition of PCI_VENDOR_ID_SYNOPSYS to linux/pci_ids.h

On Mon, Feb 16, 2015 at 07:16:36PM -0700, Joseph Kogut wrote:
> On Mon, 2015-02-16 at 17:57 -0800, Greg KH wrote:
> > On Mon, Feb 16, 2015 at 06:45:53PM -0700, Joseph Kogut wrote:
> > > Signed-off-by: Joseph Kogut <[email protected]>
> >
> > You need a changelog description here please.
> >
>
> Should I reply inline, or is resending the patch okay?

Do a 'v2' version of the patch, we can't apply inline changes :)

thanks,

greg k-h

2015-02-17 12:20:08

by Sergei Shtylyov

Subject: Re: [PATCH] usb: move definition of PCI_VENDOR_ID_SYNOPSYS to linux/pci_ids.h

Hello.

On 2/17/2015 4:45 AM, Joseph Kogut wrote:

> Signed-off-by: Joseph Kogut <[email protected]>

[...]

> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
> index e63c02a..38cff8f 100644
> --- a/include/linux/pci_ids.h
> +++ b/include/linux/pci_ids.h
> @@ -2315,6 +2315,8 @@
> #define PCI_VENDOR_ID_CENATEK 0x16CA
> #define PCI_DEVICE_ID_CENATEK_IDE 0x0001
>
> +#define PCI_VENDOR_ID_SYNOPSYS 0x16c3

0x16c3 goes before 0x16ca. And the file seems to use uppercase for hex
numbers...

[...]

WBR, Sergei

2015-02-17 12:34:42

by Sergei Shtylyov

Subject: Re: [PATCH] usb: move definition of PCI_VENDOR_ID_SYNOPSYS to linux/pci_ids.h

On 2/17/2015 3:20 PM, Sergei Shtylyov wrote:

>> Signed-off-by: Joseph Kogut <[email protected]>

> [...]

>> diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
>> index e63c02a..38cff8f 100644
>> --- a/include/linux/pci_ids.h
>> +++ b/include/linux/pci_ids.h
>> @@ -2315,6 +2315,8 @@
>> #define PCI_VENDOR_ID_CENATEK 0x16CA
>> #define PCI_DEVICE_ID_CENATEK_IDE 0x0001
>>
>> +#define PCI_VENDOR_ID_SYNOPSYS 0x16c3

> 0x16c3 goes before 0x16ca. And the file seems to use uppercase for hex
> numbers...

Actually no, it's only Cenatek ID that uses upper case, so disregard the
second comment.

> [...]

WBR, Sergei