Skip to content

Use PCI_VDEVICE

Joe Perches alsa-devel linux-fbdev linux-ide linux-media linux-scsi linux-serial linux-wireless lkml netdev 1 version Applied

Status from this message: Thanks, applied now.

Get series with b4
b4 am [email protected]

Versions newest first

  1. v1 Latest19 patches 23 repliesApplied

Patches in v1 Applied

#Subject and filesSizeRepliesApplied
1/19drivers/ata: Use PCI_VDEVICEdrivers/ata/ata_piix.c drivers/ata/pata_scc.c+50 -510 replies
2/19drivers/atm: Use PCI_VDEVICEdrivers/atm/ambassador.c drivers/atm/eni.c drivers/atm/firestream.c +7 more+14 -270 replies
3/19drivers/block: Use PCI_VDEVICEdrivers/block/sx8.c+2 -20 replies
4/19drivers/char/hw_random: Use PCI_VDEVICEdrivers/char/hw_random/amd-rng.c drivers/char/hw_random/geode-rng.c+3 -42 replies
5/19drivers/isdn: Use PCI_VDEVICEdrivers/isdn/hardware/eicon/divasmain.c drivers/isdn/hardware/mISDN/hfcmulti.c drivers/isdn/hardware/mISDN/hfcpci.c+37 -750 replies
6/19drivers/media: Use PCI_VDEVICEdrivers/media/video/bt8xx/bttv-driver.c drivers/media/video/meye.c+5 -100 replies
7/19drivers/memstick: Use PCI_VDEVICEdrivers/memstick/host/jmb38x_ms.c+1 -20 replies
8/19drivers/misc: Use PCI_VDEVICEdrivers/misc/tifm_7xx1.c+3 -60 replies
9/19drivers/mmc: Use PCI_VDEVICEdrivers/mmc/host/via-sdmmc.c+1 -20 replies
10/19drivers/net/wan: Use PCI_VDEVICEdrivers/net/wan/farsync.c drivers/net/wan/pc300_drv.c drivers/net/wan/pc300too.c +1 more+20 -341 reply
11/19drivers/net/wireless: Use PCI_VDEVICEdrivers/net/wireless/ipw2x00/ipw2200.c drivers/net/wireless/prism54/islpci_hotplug.c+6 -81 reply
12/19drivers/net: Use PCI_VDEVICEdrivers/net/3c59x.c drivers/net/8139too.c drivers/net/amd8111e.c +24 more+153 -2034 replies
13/19drivers/parport: Use PCI_VDEVICEdrivers/parport/parport_pc.c drivers/parport/parport_serial.c+65 -1260 replies
14/19drivers/scsi: Use PCI_VDEVICEdrivers/scsi/3w-9xxx.c drivers/scsi/3w-xxxx.c drivers/scsi/BusLogic.c +10 more+57 -974 replies
15/19drivers/serial: Use PCI_VDEVICEdrivers/serial/8250_pci.c+123 -4030 replies
16/19drivers/staging: Use PCI_VDEVICEdrivers/staging/comedi/drivers/addi-data/addi_common.c drivers/staging/epl/Edrv8139.c drivers/staging/vt6655/device_main.c+29 -293 replies
17/19drivers/telephony: Use PCI_VDEVICEdrivers/telephony/ixj.c+1 -20 replies
18/19drivers/video: Use PCI_VDEVICEdrivers/video/aty/aty128fb.c drivers/video/aty/radeon_base.c drivers/video/cirrusfb.c +13 more+182 -3313 replies
19/19sound: Use PCI_VDEVICEsound/oss/kahlua.c sound/pci/atiixp.c sound/pci/atiixp_modem.c +20 more+86 -965 replies

Reviews trailers per patch

2 of 19 patches have a Reviewed-by or Acked-by.

PatchMatt MackallDave DillowGrant GrundlerJens OsterkampDaniele Venzano
1/19
2/19
3/19
4/19A-b
5/19
6/19
7/19
8/19
9/19
10/19
11/19
12/19A-b A-b A-b A-b
13/19
14/19
15/19
16/19
17/19
18/19
19/19

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 5 reviewers.

Read the v1 thread

Cover letter [PATCH 00/19] Use PCI_VDEVICE

The PCI_VDEVICE macro can simplify declarations. Converted source code to use it via the script below:

#! /bin/bash

for line in \
    $(grep -ioP "PCI_VENDOR_ID_\w+\s+0x[a-f0-9]{4,4}" include/linux/pci_ids.h | \
    sed -r -e "s/PCI_VENDOR_ID_(\w+)\s+(0x[a-fA-F0-9]{1,4})/\2:\1/g" | \
    grep -vi "0x1102") ; do
    
    constant=$(echo $line | cut -f1 -d":")
    vendor=$(echo $line | cut -f2 -d":")

    echo "$constant -> $vendor"

    for file in $(grep -rP --include=*.[ch] -li -w \
	$constant drivers sound) ; do

	perl -i -e \
	    "local $/; while(<>) { s/\b$constant\s*,\s*(\w+)\s*,\s*PCI_ANY_ID\s*,\s*PCI_ANY_ID\s*,\s*0\s*,\s*0\s*,\s*/PCI_VDEVICE\($vendor, \1\), /gi; print; }" $file
    done

    for file in $(grep -rP --include=*.[ch] -li -w \
	PCI_VENDOR_ID_$vendor drivers sound) ; do

	perl -i -e \
	    "local $/; while(<>) { s/\bPCI_VENDOR_ID_$vendor\s*,\s*(\w+)\s*,\s*PCI_ANY_ID\s*,\s*PCI_ANY_ID\s*,\s*0\s*,\s*0\s*,\s*/PCI_VDEVICE\($vendor, \1\), /g; print; }" $file
    done

done

---------

Joe Perches (19):
drivers/ata: Use PCI_VDEVICE
drivers/atm: Use PCI_VDEVICE
drivers/block: Use PCI_VDEVICE
drivers/char/hw_random: Use PCI_VDEVICE
drivers/isdn: Use PCI_VDEVICE
drivers/media: Use PCI_VDEVICE
drivers/memstick: Use PCI_VDEVICE
drivers/misc: Use PCI_VDEVICE
drivers/mmc: Use PCI_VDEVICE
drivers/net/wan: Use PCI_VDEVICE
drivers/net/wireless: Use PCI_VDEVICE
drivers/net: Use PCI_VDEVICE
drivers/parport: Use PCI_VDEVICE
drivers/scsi: Use PCI_VDEVICE
drivers/serial: Use PCI_VDEVICE
drivers/staging: Use PCI_VDEVICE
drivers/telephony: Use PCI_VDEVICE
drivers/video: Use PCI_VDEVICE
sound: Use PCI_VDEVICE

 drivers/ata/ata_piix.c                             |   98 ++--
 drivers/ata/pata_scc.c                             |    3 +-
 drivers/atm/ambassador.c                           |    6 +-
 drivers/atm/eni.c                                  |    6 +-
 drivers/atm/firestream.c                           |    6 +-
 drivers/atm/fore200e.c                             |    3 +-
 drivers/atm/he.c                                   |    3 +-
 drivers/atm/horizon.c                              |    3 +-
 drivers/atm/idt77252.c                             |    3 +-
 drivers/atm/nicstar.c                              |    3 +-
 drivers/atm/solos-pci.c                            |    2 +-
 drivers/atm/zatm.c                                 |    6 +-
 drivers/block/sx8.c                                |    4 +-
 drivers/char/hw_random/amd-rng.c                   |    4 +-
 drivers/char/hw_random/geode-rng.c                 |    3 +-
 drivers/isdn/hardware/eicon/divasmain.c            |   34 +-
 drivers/isdn/hardware/mISDN/hfcmulti.c             |    9 +-
 drivers/isdn/hardware/mISDN/hfcpci.c               |   69 +--
 drivers/media/video/bt8xx/bttv-driver.c            |   12 +-
 drivers/media/video/meye.c                         |    3 +-
 drivers/memstick/host/jmb38x_ms.c                  |    3 +-
 drivers/misc/tifm_7xx1.c                           |    9 +-
 drivers/mmc/host/via-sdmmc.c                       |    3 +-
 drivers/net/3c59x.c                                |   90 ++--
 drivers/net/8139too.c                              |   18 +-
 drivers/net/amd8111e.c                             |    3 +-
 drivers/net/arcnet/com20020-pci.c                  |    6 +-
 drivers/net/bnx2.c                                 |   24 +-
 drivers/net/bnx2x_main.c                           |    9 +-
 drivers/net/cassini.c                              |    6 +-
 drivers/net/cxgb3/cxgb3_main.c                     |    2 +-
 drivers/net/irda/via-ircc.c                        |   10 +-
 drivers/net/natsemi.c                              |    2 +-
 drivers/net/ne2k-pci.c                             |   12 +-
 drivers/net/pci-skeleton.c                         |    4 +-
 drivers/net/sis900.c                               |    6 +-
 drivers/net/spider_net.c                           |    3 +-
 drivers/net/starfire.c                             |    2 +-
 drivers/net/sundance.c                             |    6 +-
 drivers/net/sungem.c                               |   24 +-
 drivers/net/tehuti.c                               |    6 +-
 drivers/net/tlan.c                                 |   39 +-
 drivers/net/tokenring/tmspci.c                     |    8 +-
 drivers/net/tulip/de2104x.c                        |    6 +-
 drivers/net/tulip/de4x5.c                          |   12 +-
 drivers/net/tulip/tulip_core.c                     |   28 +-
 drivers/net/tulip/uli526x.c                        |    4 +-
 drivers/net/tulip/winbond-840.c                    |    4 +-
 drivers/net/typhoon.c                              |   18 +-
 drivers/net/wan/farsync.c                          |   21 +-
 drivers/net/wan/pc300_drv.c                        |   12 +-
 drivers/net/wan/pc300too.c                         |   12 +-
 drivers/net/wan/wanxl.c                            |    9 +-
 drivers/net/wireless/ipw2x00/ipw2200.c             |   10 +-
 drivers/net/wireless/prism54/islpci_hotplug.c      |    4 +-
 drivers/net/yellowfin.c                            |    4 +-
 drivers/parport/parport_pc.c                       |   98 ++---
 drivers/parport/parport_serial.c                   |   93 ++---
 drivers/scsi/3w-9xxx.c                             |   12 +-
 drivers/scsi/3w-xxxx.c                             |    6 +-
 drivers/scsi/BusLogic.c                            |    9 +-
 drivers/scsi/a100u2w.c                             |    2 +-
 drivers/scsi/aacraid/linit.c                       |    6 +-
 drivers/scsi/dmx3191d.c                            |    3 +-
 drivers/scsi/fdomain.c                             |    3 +-
 drivers/scsi/initio.c                              |   20 +-
 drivers/scsi/megaraid.c                            |    9 +-
 drivers/scsi/qla1280.c                             |   18 +-
 drivers/scsi/stex.c                                |   18 +-
 drivers/scsi/sym53c8xx_2/sym_glue.c                |   45 +--
 drivers/scsi/tmscsim.c                             |    3 +-
 drivers/serial/8250_pci.c                          |  526 +++++---------------
 .../staging/comedi/drivers/addi-data/addi_common.c |   54 +-
 drivers/staging/epl/Edrv8139.c                     |    2 +-
 drivers/staging/vt6655/device_main.c               |    2 +-
 drivers/telephony/ixj.c                            |    3 +-
 drivers/video/aty/aty128fb.c                       |  141 ++----
 drivers/video/aty/radeon_base.c                    |    2 +-
 drivers/video/cirrusfb.c                           |    2 +-
 drivers/video/cyber2000fb.c                        |    9 +-
 drivers/video/i810/i810_main.c                     |   18 +-
 drivers/video/igafb.c                              |    3 +-
 drivers/video/imsttfb.c                            |    6 +-
 drivers/video/matrox/matroxfb_base.c               |   33 +-
 drivers/video/neofb.c                              |   27 +-
 drivers/video/pm2fb.c                              |    9 +-
 drivers/video/pm3fb.c                              |    3 +-
 drivers/video/pvr2fb.c                             |    3 +-
 drivers/video/riva/fbdev.c                         |  126 ++----
 drivers/video/savage/savagefb_driver.c             |   69 +--
 drivers/video/sis/sis_main.h                       |   20 +-
 drivers/video/tridentfb.c                          |   42 +-
 sound/oss/kahlua.c                                 |    2 +-
 sound/pci/atiixp.c                                 |    8 +-
 sound/pci/atiixp_modem.c                           |    4 +-
 sound/pci/au88x0/au8810.c                          |    3 +-
 sound/pci/au88x0/au8820.c                          |    3 +-
 sound/pci/au88x0/au8830.c                          |    3 +-
 sound/pci/cmipci.c                                 |   10 +-
 sound/pci/cs4281.c                                 |    2 +-
 sound/pci/cs46xx/cs46xx.c                          |    6 +-
 sound/pci/ens1370.c                                |    6 +-
 sound/pci/es1938.c                                 |    2 +-
 sound/pci/ice1712/ice1712.c                        |    2 +-
 sound/pci/ice1712/ice1724.c                        |    2 +-
 sound/pci/intel8x0.c                               |   46 +-
 sound/pci/intel8x0m.c                              |   34 +-
 sound/pci/mixart/mixart.c                          |    2 +-
 sound/pci/nm256/nm256.c                            |    6 +-
 sound/pci/rme32.c                                  |    9 +-
 sound/pci/rme96.c                                  |   12 +-
 sound/pci/sonicvibes.c                             |    2 +-
 sound/pci/via82xx.c                                |    4 +-
 sound/pci/via82xx_modem.c                          |    2 +-
 sound/pci/ymfpci/ymfpci.c                          |   12 +-
 115 files changed, 838 insertions(+), 1508 deletions(-)