diff mbox series

[v1,1/1] watchdog: wdt_pci: Correct the PCI ID vendor name

Message ID 20211005151445.89620-1-andriy.shevchenko@linux.intel.com (mailing list archive)
State Rejected
Headers show
Series [v1,1/1] watchdog: wdt_pci: Correct the PCI ID vendor name | expand

Commit Message

Andy Shevchenko Oct. 5, 2021, 3:14 p.m. UTC
The proper name of Acces I/O is with a single 's'. Correct it respectively.

While at it, convert to use PCI_DEVICE() macro, drop unneeded initializer
and comma.

Fixes: 9f2cc6f759ca ("watchdog: wdt_pci.c: move ids to pci_ids.h")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/watchdog/wdt_pci.c | 9 ++-------
 include/linux/pci_ids.h    | 4 ++--
 2 files changed, 4 insertions(+), 9 deletions(-)

Comments

Andy Shevchenko Oct. 5, 2021, 3:17 p.m. UTC | #1
On Tue, Oct 5, 2021 at 6:15 PM Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
>
> The proper name of Acces I/O is with a single 's'. Correct it respectively.
>
> While at it, convert to use PCI_DEVICE() macro, drop unneeded initializer
> and comma.

Scratch it. 8250_exar is using the wrong vendor ID as well.
Andy Shevchenko Oct. 5, 2021, 3:52 p.m. UTC | #2
On Tue, Oct 05, 2021 at 06:17:03PM +0300, Andy Shevchenko wrote:
> On Tue, Oct 5, 2021 at 6:15 PM Andy Shevchenko
> <andriy.shevchenko@linux.intel.com> wrote:
> >
> > The proper name of Acces I/O is with a single 's'. Correct it respectively.
> >
> > While at it, convert to use PCI_DEVICE() macro, drop unneeded initializer
> > and comma.
> 
> Scratch it. 8250_exar is using the wrong vendor ID as well.

After all I think we may go with wrong one for the lesser churn.
kernel test robot Oct. 5, 2021, 7:15 p.m. UTC | #3
Hi Andy,

I love your patch! Yet something to improve:

[auto build test ERROR on groeck-staging/hwmon-next]
[also build test ERROR on helgaas-pci/next linux/master linus/master v5.15-rc3 next-20210921]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Andy-Shevchenko/watchdog-wdt_pci-Correct-the-PCI-ID-vendor-name/20211005-231553
base:   https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-next
config: x86_64-randconfig-a015-20211004 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
reproduce (this is a W=1 build):
        # https://github.com/0day-ci/linux/commit/2ee39529d02438ed2b87a6a1cc2040b7d96563e1
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Andy-Shevchenko/watchdog-wdt_pci-Correct-the-PCI-ID-vendor-name/20211005-231553
        git checkout 2ee39529d02438ed2b87a6a1cc2040b7d96563e1
        # save the attached .config to linux build tree
        mkdir build_dir
        make W=1 O=build_dir ARCH=x86_64 SHELL=/bin/bash

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

   In file included from drivers/tty/serial/8250/8250_exar.c:14:
>> include/linux/pci.h:1000:12: error: 'PCI_VENDOR_ID_ACCESSIO' undeclared here (not in a function); did you mean 'PCI_VENDOR_ID_ACCESIO'?
    1000 |  .vendor = PCI_VENDOR_ID_##vend, .device = PCI_DEVICE_ID_##vend##_##dev, \
         |            ^~~~~~~~~~~~~~
   drivers/tty/serial/8250/8250_exar.c:813:40: note: in expansion of macro 'PCI_DEVICE_DATA'
     813 | #define EXAR_DEVICE(vend, devid, bd) { PCI_DEVICE_DATA(vend, devid, &bd) }
         |                                        ^~~~~~~~~~~~~~~
   drivers/tty/serial/8250/8250_exar.c:825:2: note: in expansion of macro 'EXAR_DEVICE'
     825 |  EXAR_DEVICE(ACCESSIO, COM_2S, acces_com_2x),
         |  ^~~~~~~~~~~


vim +1000 include/linux/pci.h

^1da177e4c3f41 Linus Torvalds     2005-04-16   904  
^1da177e4c3f41 Linus Torvalds     2005-04-16   905  /**
0aa0f5d1084ca1 Bjorn Helgaas      2017-12-02   906   * PCI_DEVICE - macro used to describe a specific PCI device
^1da177e4c3f41 Linus Torvalds     2005-04-16   907   * @vend: the 16 bit PCI Vendor ID
^1da177e4c3f41 Linus Torvalds     2005-04-16   908   * @dev: the 16 bit PCI Device ID
^1da177e4c3f41 Linus Torvalds     2005-04-16   909   *
^1da177e4c3f41 Linus Torvalds     2005-04-16   910   * This macro is used to create a struct pci_device_id that matches a
^1da177e4c3f41 Linus Torvalds     2005-04-16   911   * specific device.  The subvendor and subdevice fields will be set to
^1da177e4c3f41 Linus Torvalds     2005-04-16   912   * PCI_ANY_ID.
^1da177e4c3f41 Linus Torvalds     2005-04-16   913   */
^1da177e4c3f41 Linus Torvalds     2005-04-16   914  #define PCI_DEVICE(vend,dev) \
^1da177e4c3f41 Linus Torvalds     2005-04-16   915  	.vendor = (vend), .device = (dev), \
^1da177e4c3f41 Linus Torvalds     2005-04-16   916  	.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID
^1da177e4c3f41 Linus Torvalds     2005-04-16   917  
343b7258687ecf Max Gurtovoy       2021-08-26   918  /**
343b7258687ecf Max Gurtovoy       2021-08-26   919   * PCI_DEVICE_DRIVER_OVERRIDE - macro used to describe a PCI device with
343b7258687ecf Max Gurtovoy       2021-08-26   920   *                              override_only flags.
343b7258687ecf Max Gurtovoy       2021-08-26   921   * @vend: the 16 bit PCI Vendor ID
343b7258687ecf Max Gurtovoy       2021-08-26   922   * @dev: the 16 bit PCI Device ID
343b7258687ecf Max Gurtovoy       2021-08-26   923   * @driver_override: the 32 bit PCI Device override_only
343b7258687ecf Max Gurtovoy       2021-08-26   924   *
343b7258687ecf Max Gurtovoy       2021-08-26   925   * This macro is used to create a struct pci_device_id that matches only a
343b7258687ecf Max Gurtovoy       2021-08-26   926   * driver_override device. The subvendor and subdevice fields will be set to
343b7258687ecf Max Gurtovoy       2021-08-26   927   * PCI_ANY_ID.
343b7258687ecf Max Gurtovoy       2021-08-26   928   */
343b7258687ecf Max Gurtovoy       2021-08-26   929  #define PCI_DEVICE_DRIVER_OVERRIDE(vend, dev, driver_override) \
343b7258687ecf Max Gurtovoy       2021-08-26   930  	.vendor = (vend), .device = (dev), .subvendor = PCI_ANY_ID, \
343b7258687ecf Max Gurtovoy       2021-08-26   931  	.subdevice = PCI_ANY_ID, .override_only = (driver_override)
343b7258687ecf Max Gurtovoy       2021-08-26   932  
cc6711b0bf36de Max Gurtovoy       2021-08-26   933  /**
cc6711b0bf36de Max Gurtovoy       2021-08-26   934   * PCI_DRIVER_OVERRIDE_DEVICE_VFIO - macro used to describe a VFIO
cc6711b0bf36de Max Gurtovoy       2021-08-26   935   *                                   "driver_override" PCI device.
cc6711b0bf36de Max Gurtovoy       2021-08-26   936   * @vend: the 16 bit PCI Vendor ID
cc6711b0bf36de Max Gurtovoy       2021-08-26   937   * @dev: the 16 bit PCI Device ID
cc6711b0bf36de Max Gurtovoy       2021-08-26   938   *
cc6711b0bf36de Max Gurtovoy       2021-08-26   939   * This macro is used to create a struct pci_device_id that matches a
cc6711b0bf36de Max Gurtovoy       2021-08-26   940   * specific device. The subvendor and subdevice fields will be set to
cc6711b0bf36de Max Gurtovoy       2021-08-26   941   * PCI_ANY_ID and the driver_override will be set to
cc6711b0bf36de Max Gurtovoy       2021-08-26   942   * PCI_ID_F_VFIO_DRIVER_OVERRIDE.
cc6711b0bf36de Max Gurtovoy       2021-08-26   943   */
cc6711b0bf36de Max Gurtovoy       2021-08-26   944  #define PCI_DRIVER_OVERRIDE_DEVICE_VFIO(vend, dev) \
cc6711b0bf36de Max Gurtovoy       2021-08-26   945  	PCI_DEVICE_DRIVER_OVERRIDE(vend, dev, PCI_ID_F_VFIO_DRIVER_OVERRIDE)
cc6711b0bf36de Max Gurtovoy       2021-08-26   946  
3d567e0e291c4f Nithin Nayak Sujir 2012-11-14   947  /**
0aa0f5d1084ca1 Bjorn Helgaas      2017-12-02   948   * PCI_DEVICE_SUB - macro used to describe a specific PCI device with subsystem
3d567e0e291c4f Nithin Nayak Sujir 2012-11-14   949   * @vend: the 16 bit PCI Vendor ID
3d567e0e291c4f Nithin Nayak Sujir 2012-11-14   950   * @dev: the 16 bit PCI Device ID
3d567e0e291c4f Nithin Nayak Sujir 2012-11-14   951   * @subvend: the 16 bit PCI Subvendor ID
3d567e0e291c4f Nithin Nayak Sujir 2012-11-14   952   * @subdev: the 16 bit PCI Subdevice ID
3d567e0e291c4f Nithin Nayak Sujir 2012-11-14   953   *
3d567e0e291c4f Nithin Nayak Sujir 2012-11-14   954   * This macro is used to create a struct pci_device_id that matches a
3d567e0e291c4f Nithin Nayak Sujir 2012-11-14   955   * specific device with subsystem information.
3d567e0e291c4f Nithin Nayak Sujir 2012-11-14   956   */
3d567e0e291c4f Nithin Nayak Sujir 2012-11-14   957  #define PCI_DEVICE_SUB(vend, dev, subvend, subdev) \
3d567e0e291c4f Nithin Nayak Sujir 2012-11-14   958  	.vendor = (vend), .device = (dev), \
3d567e0e291c4f Nithin Nayak Sujir 2012-11-14   959  	.subvendor = (subvend), .subdevice = (subdev)
3d567e0e291c4f Nithin Nayak Sujir 2012-11-14   960  
^1da177e4c3f41 Linus Torvalds     2005-04-16   961  /**
0aa0f5d1084ca1 Bjorn Helgaas      2017-12-02   962   * PCI_DEVICE_CLASS - macro used to describe a specific PCI device class
^1da177e4c3f41 Linus Torvalds     2005-04-16   963   * @dev_class: the class, subclass, prog-if triple for this device
^1da177e4c3f41 Linus Torvalds     2005-04-16   964   * @dev_class_mask: the class mask for this device
^1da177e4c3f41 Linus Torvalds     2005-04-16   965   *
^1da177e4c3f41 Linus Torvalds     2005-04-16   966   * This macro is used to create a struct pci_device_id that matches a
^1da177e4c3f41 Linus Torvalds     2005-04-16   967   * specific PCI class.  The vendor, device, subvendor, and subdevice
^1da177e4c3f41 Linus Torvalds     2005-04-16   968   * fields will be set to PCI_ANY_ID.
^1da177e4c3f41 Linus Torvalds     2005-04-16   969   */
^1da177e4c3f41 Linus Torvalds     2005-04-16   970  #define PCI_DEVICE_CLASS(dev_class,dev_class_mask) \
^1da177e4c3f41 Linus Torvalds     2005-04-16   971  	.class = (dev_class), .class_mask = (dev_class_mask), \
^1da177e4c3f41 Linus Torvalds     2005-04-16   972  	.vendor = PCI_ANY_ID, .device = PCI_ANY_ID, \
^1da177e4c3f41 Linus Torvalds     2005-04-16   973  	.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID
^1da177e4c3f41 Linus Torvalds     2005-04-16   974  
1597cacbe39802 Alan Cox           2006-12-04   975  /**
0aa0f5d1084ca1 Bjorn Helgaas      2017-12-02   976   * PCI_VDEVICE - macro used to describe a specific PCI device in short form
c1309040967e20 Mark Rustad        2014-03-31   977   * @vend: the vendor name
c1309040967e20 Mark Rustad        2014-03-31   978   * @dev: the 16 bit PCI Device ID
1597cacbe39802 Alan Cox           2006-12-04   979   *
1597cacbe39802 Alan Cox           2006-12-04   980   * This macro is used to create a struct pci_device_id that matches a
1597cacbe39802 Alan Cox           2006-12-04   981   * specific PCI device.  The subvendor, and subdevice fields will be set
1597cacbe39802 Alan Cox           2006-12-04   982   * to PCI_ANY_ID. The macro allows the next field to follow as the device
1597cacbe39802 Alan Cox           2006-12-04   983   * private data.
1597cacbe39802 Alan Cox           2006-12-04   984   */
c1309040967e20 Mark Rustad        2014-03-31   985  #define PCI_VDEVICE(vend, dev) \
c1309040967e20 Mark Rustad        2014-03-31   986  	.vendor = PCI_VENDOR_ID_##vend, .device = (dev), \
c1309040967e20 Mark Rustad        2014-03-31   987  	.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, 0, 0
1597cacbe39802 Alan Cox           2006-12-04   988  
b72ae8cac0caff Andy Shevchenko    2018-07-29   989  /**
b72ae8cac0caff Andy Shevchenko    2018-07-29   990   * PCI_DEVICE_DATA - macro used to describe a specific PCI device in very short form
b72ae8cac0caff Andy Shevchenko    2018-07-29   991   * @vend: the vendor name (without PCI_VENDOR_ID_ prefix)
b72ae8cac0caff Andy Shevchenko    2018-07-29   992   * @dev: the device name (without PCI_DEVICE_ID_<vend>_ prefix)
b72ae8cac0caff Andy Shevchenko    2018-07-29   993   * @data: the driver data to be filled
b72ae8cac0caff Andy Shevchenko    2018-07-29   994   *
b72ae8cac0caff Andy Shevchenko    2018-07-29   995   * This macro is used to create a struct pci_device_id that matches a
b72ae8cac0caff Andy Shevchenko    2018-07-29   996   * specific PCI device.  The subvendor, and subdevice fields will be set
b72ae8cac0caff Andy Shevchenko    2018-07-29   997   * to PCI_ANY_ID.
b72ae8cac0caff Andy Shevchenko    2018-07-29   998   */
b72ae8cac0caff Andy Shevchenko    2018-07-29   999  #define PCI_DEVICE_DATA(vend, dev, data) \
b72ae8cac0caff Andy Shevchenko    2018-07-29 @1000  	.vendor = PCI_VENDOR_ID_##vend, .device = PCI_DEVICE_ID_##vend##_##dev, \
b72ae8cac0caff Andy Shevchenko    2018-07-29  1001  	.subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, 0, 0, \
b72ae8cac0caff Andy Shevchenko    2018-07-29  1002  	.driver_data = (kernel_ulong_t)(data)
b72ae8cac0caff Andy Shevchenko    2018-07-29  1003  

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
kernel test robot Oct. 5, 2021, 8:47 p.m. UTC | #4
Hi Andy,

I love your patch! Yet something to improve:

[auto build test ERROR on groeck-staging/hwmon-next]
[also build test ERROR on helgaas-pci/next linux/master linus/master v5.15-rc3 next-20210921]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/Andy-Shevchenko/watchdog-wdt_pci-Correct-the-PCI-ID-vendor-name/20211005-231553
base:   https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-next
config: i386-randconfig-a001-20211004 (attached as .config)
compiler: clang version 14.0.0 (https://github.com/llvm/llvm-project c0039de2953d15815448b4b3c3bafb45607781e0)
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # https://github.com/0day-ci/linux/commit/2ee39529d02438ed2b87a6a1cc2040b7d96563e1
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review Andy-Shevchenko/watchdog-wdt_pci-Correct-the-PCI-ID-vendor-name/20211005-231553
        git checkout 2ee39529d02438ed2b87a6a1cc2040b7d96563e1
        # save the attached .config to linux build tree
        mkdir build_dir
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=i386 SHELL=/bin/bash

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All errors (new ones prefixed by >>):

>> drivers/tty/serial/8250/8250_exar.c:825:2: error: use of undeclared identifier 'PCI_VENDOR_ID_ACCESSIO'
           EXAR_DEVICE(ACCESSIO, COM_2S, acces_com_2x),
           ^
   drivers/tty/serial/8250/8250_exar.c:813:40: note: expanded from macro 'EXAR_DEVICE'
   #define EXAR_DEVICE(vend, devid, bd) { PCI_DEVICE_DATA(vend, devid, &bd) }
                                          ^
   include/linux/pci.h:1000:12: note: expanded from macro 'PCI_DEVICE_DATA'
           .vendor = PCI_VENDOR_ID_##vend, .device = PCI_DEVICE_ID_##vend##_##dev, \
                     ^
   <scratch space>:154:1: note: expanded from here
   PCI_VENDOR_ID_ACCESSIO
   ^
   drivers/tty/serial/8250/8250_exar.c:826:2: error: use of undeclared identifier 'PCI_VENDOR_ID_ACCESSIO'
           EXAR_DEVICE(ACCESSIO, COM_4S, acces_com_4x),
           ^
   drivers/tty/serial/8250/8250_exar.c:813:40: note: expanded from macro 'EXAR_DEVICE'
   #define EXAR_DEVICE(vend, devid, bd) { PCI_DEVICE_DATA(vend, devid, &bd) }
                                          ^
   include/linux/pci.h:1000:12: note: expanded from macro 'PCI_DEVICE_DATA'
           .vendor = PCI_VENDOR_ID_##vend, .device = PCI_DEVICE_ID_##vend##_##dev, \
                     ^
   <scratch space>:158:1: note: expanded from here
   PCI_VENDOR_ID_ACCESSIO
   ^
   drivers/tty/serial/8250/8250_exar.c:827:2: error: use of undeclared identifier 'PCI_VENDOR_ID_ACCESSIO'
           EXAR_DEVICE(ACCESSIO, COM_8S, acces_com_8x),
           ^
   drivers/tty/serial/8250/8250_exar.c:813:40: note: expanded from macro 'EXAR_DEVICE'
   #define EXAR_DEVICE(vend, devid, bd) { PCI_DEVICE_DATA(vend, devid, &bd) }
                                          ^
   include/linux/pci.h:1000:12: note: expanded from macro 'PCI_DEVICE_DATA'
           .vendor = PCI_VENDOR_ID_##vend, .device = PCI_DEVICE_ID_##vend##_##dev, \
                     ^
   <scratch space>:162:1: note: expanded from here
   PCI_VENDOR_ID_ACCESSIO
   ^
   drivers/tty/serial/8250/8250_exar.c:828:2: error: use of undeclared identifier 'PCI_VENDOR_ID_ACCESSIO'
           EXAR_DEVICE(ACCESSIO, COM232_8, acces_com_8x),
           ^
   drivers/tty/serial/8250/8250_exar.c:813:40: note: expanded from macro 'EXAR_DEVICE'
   #define EXAR_DEVICE(vend, devid, bd) { PCI_DEVICE_DATA(vend, devid, &bd) }
                                          ^
   include/linux/pci.h:1000:12: note: expanded from macro 'PCI_DEVICE_DATA'
           .vendor = PCI_VENDOR_ID_##vend, .device = PCI_DEVICE_ID_##vend##_##dev, \
                     ^
   <scratch space>:166:1: note: expanded from here
   PCI_VENDOR_ID_ACCESSIO
   ^
   drivers/tty/serial/8250/8250_exar.c:829:2: error: use of undeclared identifier 'PCI_VENDOR_ID_ACCESSIO'
           EXAR_DEVICE(ACCESSIO, COM_2SM, acces_com_2x),
           ^
   drivers/tty/serial/8250/8250_exar.c:813:40: note: expanded from macro 'EXAR_DEVICE'
   #define EXAR_DEVICE(vend, devid, bd) { PCI_DEVICE_DATA(vend, devid, &bd) }
                                          ^
   include/linux/pci.h:1000:12: note: expanded from macro 'PCI_DEVICE_DATA'
           .vendor = PCI_VENDOR_ID_##vend, .device = PCI_DEVICE_ID_##vend##_##dev, \
                     ^
   <scratch space>:170:1: note: expanded from here
   PCI_VENDOR_ID_ACCESSIO
   ^
   drivers/tty/serial/8250/8250_exar.c:830:2: error: use of undeclared identifier 'PCI_VENDOR_ID_ACCESSIO'
           EXAR_DEVICE(ACCESSIO, COM_4SM, acces_com_4x),
           ^
   drivers/tty/serial/8250/8250_exar.c:813:40: note: expanded from macro 'EXAR_DEVICE'
   #define EXAR_DEVICE(vend, devid, bd) { PCI_DEVICE_DATA(vend, devid, &bd) }
                                          ^
   include/linux/pci.h:1000:12: note: expanded from macro 'PCI_DEVICE_DATA'
           .vendor = PCI_VENDOR_ID_##vend, .device = PCI_DEVICE_ID_##vend##_##dev, \
                     ^
   <scratch space>:174:1: note: expanded from here
   PCI_VENDOR_ID_ACCESSIO
   ^
   drivers/tty/serial/8250/8250_exar.c:831:2: error: use of undeclared identifier 'PCI_VENDOR_ID_ACCESSIO'
           EXAR_DEVICE(ACCESSIO, COM_8SM, acces_com_8x),
           ^
   drivers/tty/serial/8250/8250_exar.c:813:40: note: expanded from macro 'EXAR_DEVICE'
   #define EXAR_DEVICE(vend, devid, bd) { PCI_DEVICE_DATA(vend, devid, &bd) }
                                          ^
   include/linux/pci.h:1000:12: note: expanded from macro 'PCI_DEVICE_DATA'
           .vendor = PCI_VENDOR_ID_##vend, .device = PCI_DEVICE_ID_##vend##_##dev, \
                     ^
   <scratch space>:178:1: note: expanded from here
   PCI_VENDOR_ID_ACCESSIO
   ^
   7 errors generated.


vim +/PCI_VENDOR_ID_ACCESSIO +825 drivers/tty/serial/8250/8250_exar.c

d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  814  
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  815  #define IBM_DEVICE(devid, sdevid, bd) {			\
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  816  	PCI_DEVICE_SUB(					\
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  817  		PCI_VENDOR_ID_EXAR,			\
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  818  		PCI_DEVICE_ID_EXAR_##devid,		\
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  819  		PCI_VENDOR_ID_IBM,			\
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  820  		PCI_SUBDEVICE_ID_IBM_##sdevid), 0, 0,	\
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  821  		(kernel_ulong_t)&bd			\
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  822  	}
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  823  
3637c46032515f Arvind Yadav    2017-07-23  824  static const struct pci_device_id exar_pci_tbl[] = {
24637007394e85 Andy Shevchenko 2020-05-12 @825  	EXAR_DEVICE(ACCESSIO, COM_2S, acces_com_2x),
24637007394e85 Andy Shevchenko 2020-05-12  826  	EXAR_DEVICE(ACCESSIO, COM_4S, acces_com_4x),
24637007394e85 Andy Shevchenko 2020-05-12  827  	EXAR_DEVICE(ACCESSIO, COM_8S, acces_com_8x),
24637007394e85 Andy Shevchenko 2020-05-12  828  	EXAR_DEVICE(ACCESSIO, COM232_8, acces_com_8x),
24637007394e85 Andy Shevchenko 2020-05-12  829  	EXAR_DEVICE(ACCESSIO, COM_2SM, acces_com_2x),
24637007394e85 Andy Shevchenko 2020-05-12  830  	EXAR_DEVICE(ACCESSIO, COM_4SM, acces_com_4x),
24637007394e85 Andy Shevchenko 2020-05-12  831  	EXAR_DEVICE(ACCESSIO, COM_8SM, acces_com_8x),
10c5ccc3c6d32f Jay Dolan       2020-03-05  832  
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  833  	CONNECT_DEVICE(XR17C152, UART_2_232, pbn_connect),
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  834  	CONNECT_DEVICE(XR17C154, UART_4_232, pbn_connect),
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  835  	CONNECT_DEVICE(XR17C158, UART_8_232, pbn_connect),
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  836  	CONNECT_DEVICE(XR17C152, UART_1_1, pbn_connect),
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  837  	CONNECT_DEVICE(XR17C154, UART_2_2, pbn_connect),
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  838  	CONNECT_DEVICE(XR17C158, UART_4_4, pbn_connect),
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  839  	CONNECT_DEVICE(XR17C152, UART_2, pbn_connect),
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  840  	CONNECT_DEVICE(XR17C154, UART_4, pbn_connect),
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  841  	CONNECT_DEVICE(XR17C158, UART_8, pbn_connect),
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  842  	CONNECT_DEVICE(XR17C152, UART_2_485, pbn_connect),
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  843  	CONNECT_DEVICE(XR17C154, UART_4_485, pbn_connect),
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  844  	CONNECT_DEVICE(XR17C158, UART_8_485, pbn_connect),
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  845  
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  846  	IBM_DEVICE(XR17C152, SATURN_SERIAL_ONE_PORT, pbn_exar_ibm_saturn),
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  847  
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  848  	/* Exar Corp. XR17C15[248] Dual/Quad/Octal UART */
24637007394e85 Andy Shevchenko 2020-05-12  849  	EXAR_DEVICE(EXAR, XR17C152, pbn_exar_XR17C15x),
24637007394e85 Andy Shevchenko 2020-05-12  850  	EXAR_DEVICE(EXAR, XR17C154, pbn_exar_XR17C15x),
24637007394e85 Andy Shevchenko 2020-05-12  851  	EXAR_DEVICE(EXAR, XR17C158, pbn_exar_XR17C15x),
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  852  
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  853  	/* Exar Corp. XR17V[48]35[248] Dual/Quad/Octal/Hexa PCIe UARTs */
24637007394e85 Andy Shevchenko 2020-05-12  854  	EXAR_DEVICE(EXAR, XR17V352, pbn_exar_XR17V35x),
24637007394e85 Andy Shevchenko 2020-05-12  855  	EXAR_DEVICE(EXAR, XR17V354, pbn_exar_XR17V35x),
24637007394e85 Andy Shevchenko 2020-05-12  856  	EXAR_DEVICE(EXAR, XR17V358, pbn_exar_XR17V35x),
24637007394e85 Andy Shevchenko 2020-05-12  857  	EXAR_DEVICE(EXAR, XR17V4358, pbn_exar_XR17V4358),
24637007394e85 Andy Shevchenko 2020-05-12  858  	EXAR_DEVICE(EXAR, XR17V8358, pbn_exar_XR17V8358),
c6b9e95dde7b54 Valmer Huhn     2020-08-13  859  	EXAR_DEVICE(COMMTECH, 4222PCIE, pbn_fastcom35x_2),
c6b9e95dde7b54 Valmer Huhn     2020-08-13  860  	EXAR_DEVICE(COMMTECH, 4224PCIE, pbn_fastcom35x_4),
c6b9e95dde7b54 Valmer Huhn     2020-08-13  861  	EXAR_DEVICE(COMMTECH, 4228PCIE, pbn_fastcom35x_8),
24637007394e85 Andy Shevchenko 2020-05-12  862  
24637007394e85 Andy Shevchenko 2020-05-12  863  	EXAR_DEVICE(COMMTECH, 4222PCI335, pbn_fastcom335_2),
24637007394e85 Andy Shevchenko 2020-05-12  864  	EXAR_DEVICE(COMMTECH, 4224PCI335, pbn_fastcom335_4),
24637007394e85 Andy Shevchenko 2020-05-12  865  	EXAR_DEVICE(COMMTECH, 2324PCI335, pbn_fastcom335_4),
24637007394e85 Andy Shevchenko 2020-05-12  866  	EXAR_DEVICE(COMMTECH, 2328PCI335, pbn_fastcom335_8),
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  867  	{ 0, }
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  868  };
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  869  MODULE_DEVICE_TABLE(pci, exar_pci_tbl);
d0aeaa83f0b0f7 Sudip Mukherjee 2017-01-30  870  

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
diff mbox series

Patch

diff --git a/drivers/watchdog/wdt_pci.c b/drivers/watchdog/wdt_pci.c
index d5e56b601351..ba63f442438d 100644
--- a/drivers/watchdog/wdt_pci.c
+++ b/drivers/watchdog/wdt_pci.c
@@ -717,13 +717,8 @@  static void wdtpci_remove_one(struct pci_dev *pdev)
 
 
 static const struct pci_device_id wdtpci_pci_tbl[] = {
-	{
-		.vendor	   = PCI_VENDOR_ID_ACCESSIO,
-		.device	   = PCI_DEVICE_ID_ACCESSIO_WDG_CSM,
-		.subvendor = PCI_ANY_ID,
-		.subdevice = PCI_ANY_ID,
-	},
-	{ 0, }, /* terminate list */
+	{ PCI_DEVICE(PCI_VENDOR_ID_ACCESIO, PCI_DEVICE_ID_ACCESIO_WDG_CSM) },
+	{ } /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci, wdtpci_pci_tbl);
 
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 011f2f1ea5bb..37a9f12b4def 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2611,8 +2611,8 @@ 
 #define PCI_VENDOR_ID_AKS		0x416c
 #define PCI_DEVICE_ID_AKS_ALADDINCARD	0x0100
 
-#define PCI_VENDOR_ID_ACCESSIO		0x494f
-#define PCI_DEVICE_ID_ACCESSIO_WDG_CSM	0x22c0
+#define PCI_VENDOR_ID_ACCESIO		0x494f
+#define PCI_DEVICE_ID_ACCESIO_WDG_CSM	0x22c0
 
 #define PCI_VENDOR_ID_S3		0x5333
 #define PCI_DEVICE_ID_S3_TRIO		0x8811