Remove the remaining macros, and inline private functions, used to get the dev->private pointer from the comedi_device. The macros all rely on a local variable having a specific name. The inline private functions just make the code confusing. H Hartley Sweeten (9): staging: comedi: cb_pcidas64: remove inline priv() function staging: comedi: gsc_hpdi: remove inline priv() function staging: comedi: ni_65xx: remove inline private() function staging: comedi: ni_660x: remove inline private() function staging: comedi: poc: introduce struct poc_private staging: comedi: addi-data: remove devpriv macro staging: comedi: ni_mio_common: remove devpriv macro staging: comedi: drivers: remove remaining devpriv macros staging: comedi: s626: remove devpriv macro drivers/staging/comedi/drivers/8255_pci.c | 2 +- .../comedi/drivers/addi-data/APCI1710_82x54.c | 8 +- .../comedi/drivers/addi-data/APCI1710_Chrono.c | 7 + .../comedi/drivers/addi-data/APCI1710_Dig_io.c | 4 + .../comedi/drivers/addi-data/APCI1710_INCCPT.c | 42 + .../comedi/drivers/addi-data/APCI1710_Inp_cpt.c | 5 +- .../comedi/drivers/addi-data/APCI1710_Pwm.c | 9 +- .../comedi/drivers/addi-data/APCI1710_Ssi.c | 4 + .../comedi/drivers/addi-data/APCI1710_Tor.c | 5 +- .../comedi/drivers/addi-data/APCI1710_Ttl.c | 4 + .../staging/comedi/drivers/addi-data/addi_common.c | 14 +- .../staging/comedi/drivers/addi-data/addi_eeprom.c | 1 + .../comedi/drivers/addi-data/hwdrv_APCI1710.c | 2 + .../comedi/drivers/addi-data/hwdrv_apci035.c | 14 + .../comedi/drivers/addi-data/hwdrv_apci1032.c | 11 +- .../comedi/drivers/addi-data/hwdrv_apci1500.c | 19 +- .../comedi/drivers/addi-data/hwdrv_apci1516.c | 17 +- .../comedi/drivers/addi-data/hwdrv_apci1564.c | 16 + .../comedi/drivers/addi-data/hwdrv_apci16xx.c | 4 + .../comedi/drivers/addi-data/hwdrv_apci2016.c | 12 + .../comedi/drivers/addi-data/hwdrv_apci2032.c | 14 + .../comedi/drivers/addi-data/hwdrv_apci2200.c | 19 +- .../comedi/drivers/addi-data/hwdrv_apci3120.c | 37 +- .../comedi/drivers/addi-data/hwdrv_apci3200.c | 28 +- .../comedi/drivers/addi-data/hwdrv_apci3501.c | 18 + .../comedi/drivers/addi-data/hwdrv_apci3xxx.c | 16 + drivers/staging/comedi/drivers/adl_pci6208.c | 2 +- drivers/staging/comedi/drivers/adl_pci9118.c | 6 +- drivers/staging/comedi/drivers/adv_pci1710.c | 2 +- drivers/staging/comedi/drivers/adv_pci1723.c | 2 +- drivers/staging/comedi/drivers/adv_pci_dio.c | 2 +- drivers/staging/comedi/drivers/amplc_dio200.c | 18 +- drivers/staging/comedi/drivers/amplc_pc236.c | 20 +- drivers/staging/comedi/drivers/amplc_pci224.c | 16 +- drivers/staging/comedi/drivers/amplc_pci230.c | 16 +- drivers/staging/comedi/drivers/cb_das16_cs.c | 7 +- drivers/staging/comedi/drivers/cb_pcidas64.c | 877 +++++++++++---------- drivers/staging/comedi/drivers/comedi_parport.c | 2 +- drivers/staging/comedi/drivers/comedi_test.c | 2 +- drivers/staging/comedi/drivers/daqboard2000.c | 4 +- drivers/staging/comedi/drivers/das08.c | 12 +- drivers/staging/comedi/drivers/das08_cs.c | 6 +- drivers/staging/comedi/drivers/das16.c | 21 +- drivers/staging/comedi/drivers/das16m1.c | 16 +- drivers/staging/comedi/drivers/das1800.c | 30 +- drivers/staging/comedi/drivers/das6402.c | 14 +- drivers/staging/comedi/drivers/das800.c | 20 +- drivers/staging/comedi/drivers/dmm32at.c | 5 +- drivers/staging/comedi/drivers/dt2801.c | 12 +- drivers/staging/comedi/drivers/dt2811.c | 11 +- drivers/staging/comedi/drivers/dt2814.c | 10 +- drivers/staging/comedi/drivers/dt2815.c | 11 +- drivers/staging/comedi/drivers/dt282x.c | 31 +- drivers/staging/comedi/drivers/dt3000.c | 23 +- drivers/staging/comedi/drivers/dt9812.c | 16 +- drivers/staging/comedi/drivers/fl512.c | 12 +- drivers/staging/comedi/drivers/gsc_hpdi.c | 258 +++--- drivers/staging/comedi/drivers/icp_multi.c | 2 +- drivers/staging/comedi/drivers/ii_pci20kc.c | 14 +- drivers/staging/comedi/drivers/jr3_pci.c | 9 +- drivers/staging/comedi/drivers/me_daq.c | 22 +- drivers/staging/comedi/drivers/mpc624.c | 12 +- drivers/staging/comedi/drivers/multiq3.c | 9 +- drivers/staging/comedi/drivers/ni_6527.c | 21 +- drivers/staging/comedi/drivers/ni_65xx.c | 120 +-- drivers/staging/comedi/drivers/ni_660x.c | 164 ++-- drivers/staging/comedi/drivers/ni_670x.c | 3 +- drivers/staging/comedi/drivers/ni_at_a2150.c | 22 +- drivers/staging/comedi/drivers/ni_at_ao.c | 15 +- drivers/staging/comedi/drivers/ni_atmio.c | 11 +- drivers/staging/comedi/drivers/ni_atmio16d.c | 13 +- drivers/staging/comedi/drivers/ni_daq_dio24.c | 10 +- drivers/staging/comedi/drivers/ni_labpc.c | 48 +- drivers/staging/comedi/drivers/ni_labpc_cs.c | 9 +- drivers/staging/comedi/drivers/ni_mio_common.c | 147 +++- drivers/staging/comedi/drivers/ni_mio_cs.c | 9 +- drivers/staging/comedi/drivers/ni_pcidio.c | 32 +- drivers/staging/comedi/drivers/ni_pcimio.c | 27 +- drivers/staging/comedi/drivers/pcl711.c | 13 +- drivers/staging/comedi/drivers/pcl726.c | 12 +- drivers/staging/comedi/drivers/pcl812.c | 27 +- drivers/staging/comedi/drivers/pcl816.c | 21 +- drivers/staging/comedi/drivers/pcl818.c | 32 +- drivers/staging/comedi/drivers/pcm3724.c | 14 +- drivers/staging/comedi/drivers/pcmad.c | 8 +- drivers/staging/comedi/drivers/pcmda12.c | 17 +- drivers/staging/comedi/drivers/pcmmio.c | 31 +- drivers/staging/comedi/drivers/pcmuio.c | 27 +- drivers/staging/comedi/drivers/poc.c | 17 +- drivers/staging/comedi/drivers/rtd520.c | 9 +- drivers/staging/comedi/drivers/rti800.c | 11 +- drivers/staging/comedi/drivers/rti802.c | 11 +- drivers/staging/comedi/drivers/s626.c | 40 +- drivers/staging/comedi/drivers/serial2002.c | 24 +- drivers/staging/comedi/drivers/skel.c | 20 +- 95 files changed, 1886 insertions(+), 983 deletions(-) -- 1.7.11 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
