diff options
| author | H Hartley Sweeten <hsweeten@visionengravers.com> | 2014-07-17 11:57:56 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-07-17 17:59:03 -0700 |
| commit | 6b362f5bea0dfbb648656041a92f6a00b298f558 (patch) | |
| tree | 949089477efa4eda7b38c29b0f4836d5909a7d34 | |
| parent | 1c0cb9ace5f16242838549cb2ffea2be72b7c707 (diff) | |
| download | op-kernel-dev-6b362f5bea0dfbb648656041a92f6a00b298f558.zip op-kernel-dev-6b362f5bea0dfbb648656041a92f6a00b298f558.tar.gz | |
staging: comedi: remove comedi_error()
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.
All of the users of this function have been converted to use dev_err()
directly. Remove the now unused function.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/comedi/comedi_fops.c | 6 | ||||
| -rw-r--r-- | drivers/staging/comedi/comedidev.h | 1 | ||||
| -rw-r--r-- | drivers/staging/comedi/drivers.c | 2 |
3 files changed, 0 insertions, 9 deletions
diff --git a/drivers/staging/comedi/comedi_fops.c b/drivers/staging/comedi/comedi_fops.c index 3686296..630ef1f 100644 --- a/drivers/staging/comedi/comedi_fops.c +++ b/drivers/staging/comedi/comedi_fops.c @@ -2401,12 +2401,6 @@ static const struct file_operations comedi_fops = { .llseek = noop_llseek, }; -void comedi_error(const struct comedi_device *dev, const char *s) -{ - dev_err(dev->class_dev, "%s: %s\n", dev->driver->driver_name, s); -} -EXPORT_SYMBOL_GPL(comedi_error); - void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s) { struct comedi_async *async = s->async; diff --git a/drivers/staging/comedi/comedidev.h b/drivers/staging/comedi/comedidev.h index a7f24a9..67cc882 100644 --- a/drivers/staging/comedi/comedidev.h +++ b/drivers/staging/comedi/comedidev.h @@ -280,7 +280,6 @@ static inline const void *comedi_board(const struct comedi_device *dev) */ void comedi_event(struct comedi_device *dev, struct comedi_subdevice *s); -void comedi_error(const struct comedi_device *dev, const char *s); /* we can expand the number of bits used to encode devices/subdevices into the minor number soon, after more distros support > 8 bit minor numbers diff --git a/drivers/staging/comedi/drivers.c b/drivers/staging/comedi/drivers.c index 299726f..9bfd05b 100644 --- a/drivers/staging/comedi/drivers.c +++ b/drivers/staging/comedi/drivers.c @@ -591,8 +591,6 @@ int comedi_device_attach(struct comedi_device *dev, struct comedi_devconfig *it) ret = -ENOSYS; goto out; } - /* initialize dev->driver here so - * comedi_error() can be called from attach */ dev->driver = driv; dev->board_name = dev->board_ptr ? *(const char **)dev->board_ptr : dev->driver->driver_name; |
