| Message ID | 404c3c6be07d4c8b2a9a7297c387509b801e62a5.1612274129.git.ryder.lee@mediatek.com (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Felix Fietkau |
| Headers | show |
| Series | mt76: use PCI_VENDOR_ID_MEDIATEK to avoid open coded | expand |
> Use PCI standard defines. > > Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> Acked-by: Lorenzo Bianconi <lorenzo@kernel.org> > --- > drivers/net/wireless/mediatek/mt76/mt7603/pci.c | 2 +- > drivers/net/wireless/mediatek/mt76/mt7615/pci.c | 6 +++--- > drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 6 +++--- > drivers/net/wireless/mediatek/mt76/mt76x2/pci.c | 6 +++--- > drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 2 +- > 5 files changed, 11 insertions(+), 11 deletions(-) > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/pci.c b/drivers/net/wireless/mediatek/mt76/mt7603/pci.c > index 06fa28f645f2..aa6cb668b012 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7603/pci.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7603/pci.c > @@ -7,7 +7,7 @@ > #include "mt7603.h" > > static const struct pci_device_id mt76pci_device_table[] = { > - { PCI_DEVICE(0x14c3, 0x7603) }, > + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7603) }, > { }, > }; > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/pci.c b/drivers/net/wireless/mediatek/mt76/mt7615/pci.c > index 71487f532f36..11f169cdd603 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7615/pci.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7615/pci.c > @@ -13,9 +13,9 @@ > #include "mcu.h" > > static const struct pci_device_id mt7615_pci_device_table[] = { > - { PCI_DEVICE(0x14c3, 0x7615) }, > - { PCI_DEVICE(0x14c3, 0x7663) }, > - { PCI_DEVICE(0x14c3, 0x7611) }, > + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7615) }, > + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7663) }, > + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7611) }, > { }, > }; > > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c > index 02d0aa0b815e..5847f943e8da 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c > +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c > @@ -221,9 +221,9 @@ mt76x0e_remove(struct pci_dev *pdev) > } > > static const struct pci_device_id mt76x0e_device_table[] = { > - { PCI_DEVICE(0x14c3, 0x7610) }, > - { PCI_DEVICE(0x14c3, 0x7630) }, > - { PCI_DEVICE(0x14c3, 0x7650) }, > + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7610) }, > + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7630) }, > + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7650) }, > { }, > }; > > diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c > index ecaf85b483ac..adf288e50e21 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c > +++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c > @@ -10,9 +10,9 @@ > #include "mt76x2.h" > > static const struct pci_device_id mt76x2e_device_table[] = { > - { PCI_DEVICE(0x14c3, 0x7662) }, > - { PCI_DEVICE(0x14c3, 0x7612) }, > - { PCI_DEVICE(0x14c3, 0x7602) }, > + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7662) }, > + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7612) }, > + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7602) }, > { }, > }; > > diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c > index 5570b4a50531..33ed952d7f4c 100644 > --- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c > +++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c > @@ -13,7 +13,7 @@ > #include "../trace.h" > > static const struct pci_device_id mt7921_pci_device_table[] = { > - { PCI_DEVICE(0x14c3, 0x7961) }, > + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7961) }, > { }, > }; > > -- > 2.18.0 >
diff --git a/drivers/net/wireless/mediatek/mt76/mt7603/pci.c b/drivers/net/wireless/mediatek/mt76/mt7603/pci.c index 06fa28f645f2..aa6cb668b012 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7603/pci.c +++ b/drivers/net/wireless/mediatek/mt76/mt7603/pci.c @@ -7,7 +7,7 @@ #include "mt7603.h" static const struct pci_device_id mt76pci_device_table[] = { - { PCI_DEVICE(0x14c3, 0x7603) }, + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7603) }, { }, }; diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/pci.c b/drivers/net/wireless/mediatek/mt76/mt7615/pci.c index 71487f532f36..11f169cdd603 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/pci.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/pci.c @@ -13,9 +13,9 @@ #include "mcu.h" static const struct pci_device_id mt7615_pci_device_table[] = { - { PCI_DEVICE(0x14c3, 0x7615) }, - { PCI_DEVICE(0x14c3, 0x7663) }, - { PCI_DEVICE(0x14c3, 0x7611) }, + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7615) }, + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7663) }, + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7611) }, { }, }; diff --git a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c index 02d0aa0b815e..5847f943e8da 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x0/pci.c @@ -221,9 +221,9 @@ mt76x0e_remove(struct pci_dev *pdev) } static const struct pci_device_id mt76x0e_device_table[] = { - { PCI_DEVICE(0x14c3, 0x7610) }, - { PCI_DEVICE(0x14c3, 0x7630) }, - { PCI_DEVICE(0x14c3, 0x7650) }, + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7610) }, + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7630) }, + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7650) }, { }, }; diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c b/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c index ecaf85b483ac..adf288e50e21 100644 --- a/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c +++ b/drivers/net/wireless/mediatek/mt76/mt76x2/pci.c @@ -10,9 +10,9 @@ #include "mt76x2.h" static const struct pci_device_id mt76x2e_device_table[] = { - { PCI_DEVICE(0x14c3, 0x7662) }, - { PCI_DEVICE(0x14c3, 0x7612) }, - { PCI_DEVICE(0x14c3, 0x7602) }, + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7662) }, + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7612) }, + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7602) }, { }, }; diff --git a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c index 5570b4a50531..33ed952d7f4c 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7921/pci.c +++ b/drivers/net/wireless/mediatek/mt76/mt7921/pci.c @@ -13,7 +13,7 @@ #include "../trace.h" static const struct pci_device_id mt7921_pci_device_table[] = { - { PCI_DEVICE(0x14c3, 0x7961) }, + { PCI_DEVICE(PCI_VENDOR_ID_MEDIATEK, 0x7961) }, { }, };
Use PCI standard defines. Signed-off-by: Ryder Lee <ryder.lee@mediatek.com> --- drivers/net/wireless/mediatek/mt76/mt7603/pci.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7615/pci.c | 6 +++--- drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 6 +++--- drivers/net/wireless/mediatek/mt76/mt76x2/pci.c | 6 +++--- drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-)