Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b362f5b authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

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: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1c0cb9ac

drivers/staging/comedi/comedi_fops.c

+0 −6
Original line number Diff line number Diff line
@@ -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;

drivers/staging/comedi/comedidev.h

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/staging/comedi/drivers.c

+0 −2
Original line number Diff line number Diff line
@@ -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;