The comedi_error() function is just a wrapper around dev_err() that adds the dev->driver->driver_name prefix to the message and a terminating new-line character. The addition of the driver_name is just added noise and some of the users of comedi_error() add unnecessary additional new-line characters. Use dev_err() directly instead of comedi_error() to avoid any confusion and so that all the comedi generated kernel messages have the same format. Then remove the unused function. H Hartley Sweeten (29): staging: comedi: s626: remove use of comedi_error() staging: comedi: pcl818: remove use of comedi_error() staging: comedi: pcl816: remove use of comedi_error() staging: comedi: pcl711: remove use of comedi_error() staging: comedi: ni_pcidio: remove use of comedi_error() staging: comedi: ni_mio_common: remove use of comedi_error() staging: comedi: ni_labpc: remove use of comedi_error() staging: comedi: ni_at_a2150: remove use of comedi_error() staging: comedi: ni_660x: remove use of comedi_error() staging: comedi: cb_pcidas64: remove use of comedi_error() staging: comedi: icp_multi: remove use of comedi_error() staging: comedi: dt282x: remove use of comedi_error() staging: comedi: dt2814: remove use of comedi_error() staging: comedi: dmm32at: remove use of comedi_error() staging: comedi: das1800: remove use of comedi_error() staging: comedi: das16m1: remove use of comedi_error() staging: comedi: das08: remove use of comedi_error() staging: comedi: comedi_test: remove use of comedi_error() staging: comedi: cb_pcidas: remove use of comedi_error() staging: comedi: amplc_pci230: remove use of comedi_error() staging: comedi: amplc_dio_common: remove use of comedi_error() staging: comedi: adv_pci_dio: remove use of comedi_error() staging: comedi: adv_pci1724: remove use of comedi_error() staging: comedi: adl_pci9118: remove use of comedi_error() staging: comedi: addi_apci_3501: remove use of comedi_error() staging: comedi: hwdrv_apci3120: remove use of comedi_error() staging: comedi: hwdrv_apci1564: remove use of comedi_error() staging: comedi: hwdrv_apci1500: remove use of comedi_error() staging: comedi: remove comedi_error() drivers/staging/comedi/comedi_fops.c | 6 --- drivers/staging/comedi/comedidev.h | 1 - drivers/staging/comedi/drivers.c | 2 - .../comedi/drivers/addi-data/hwdrv_apci1500.c | 7 +-- .../comedi/drivers/addi-data/hwdrv_apci1564.c | 3 +- .../comedi/drivers/addi-data/hwdrv_apci3120.c | 27 ++++++----- drivers/staging/comedi/drivers/addi_apci_3501.c | 2 +- drivers/staging/comedi/drivers/adl_pci9118.c | 49 +++++++++---------- drivers/staging/comedi/drivers/adv_pci1724.c | 15 +++--- drivers/staging/comedi/drivers/adv_pci_dio.c | 6 +-- .../staging/comedi/drivers/amplc_dio200_common.c | 2 +- drivers/staging/comedi/drivers/amplc_pci230.c | 12 ++--- drivers/staging/comedi/drivers/cb_pcidas.c | 14 +++--- drivers/staging/comedi/drivers/cb_pcidas64.c | 33 +++++++------ drivers/staging/comedi/drivers/comedi_test.c | 4 +- drivers/staging/comedi/drivers/das08.c | 2 +- drivers/staging/comedi/drivers/das16m1.c | 6 +-- drivers/staging/comedi/drivers/das1800.c | 6 +-- drivers/staging/comedi/drivers/dmm32at.c | 2 +- drivers/staging/comedi/drivers/dt2814.c | 2 +- drivers/staging/comedi/drivers/dt282x.c | 9 ++-- drivers/staging/comedi/drivers/icp_multi.c | 10 ++-- drivers/staging/comedi/drivers/ni_660x.c | 8 ++-- drivers/staging/comedi/drivers/ni_at_a2150.c | 15 +++--- drivers/staging/comedi/drivers/ni_labpc.c | 12 ++--- drivers/staging/comedi/drivers/ni_mio_common.c | 56 ++++++++++++---------- drivers/staging/comedi/drivers/ni_pcidio.c | 2 +- drivers/staging/comedi/drivers/pcl711.c | 2 +- drivers/staging/comedi/drivers/pcl816.c | 2 +- drivers/staging/comedi/drivers/pcl818.c | 9 ++-- drivers/staging/comedi/drivers/s626.c | 18 +++---- 31 files changed, 173 insertions(+), 171 deletions(-) -- 1.9.3 _______________________________________________ devel mailing list devel@xxxxxxxxxxxxxxxxxxxxxx http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel