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

Commit 0435f933 authored by Pavel Roskin's avatar Pavel Roskin Committed by Greg Kroah-Hartman
Browse files

staging: comedi: remove COMEDI_DEVICE_CREATE macro, expand all callers 



This is no longer needed as the code is now in the main kernel tree.

Signed-off-by: default avatarPavel Roskin <proski@gnu.org>
Cc: Frank Mori Hess <fmhess@users.sourceforge.net>
Cc: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 7104b5df

drivers/staging/comedi/comedi_fops.c

+5 −7
Original line number Diff line number Diff line
@@ -2175,9 +2175,8 @@ int comedi_alloc_board_minor(struct device *hardware_device) 
		return -EBUSY;

	}

	info->device->minor = i;

	csdev = COMEDI_DEVICE_CREATE(comedi_class, NULL,

				     MKDEV(COMEDI_MAJOR, i), NULL,

				     hardware_device, "comedi%i", i);

	csdev = device_create(comedi_class, hardware_device,

			      MKDEV(COMEDI_MAJOR, i), NULL, "comedi%i", i);

	if (!IS_ERR(csdev))

		info->device->class_dev = csdev;

	dev_set_drvdata(csdev, info);
@@ -2276,10 +2275,9 @@ int comedi_alloc_subdevice_minor(struct comedi_device *dev, 
		return -EBUSY;

	}

	s->minor = i;

	csdev = COMEDI_DEVICE_CREATE(comedi_class, dev->class_dev,

				     MKDEV(COMEDI_MAJOR, i), NULL, NULL,

				     "comedi%i_subd%i", dev->minor,

				     (int)(s - dev->subdevices));

	csdev = device_create(comedi_class, dev->class_dev,

			      MKDEV(COMEDI_MAJOR, i), NULL, "comedi%i_subd%i",

			      dev->minor, (int)(s - dev->subdevices));

	if (!IS_ERR(csdev))

		s->class_dev = csdev;

	dev_set_drvdata(csdev, info);

drivers/staging/comedi/comedidev.h

+0 −3
Original line number Diff line number Diff line
@@ -61,9 +61,6 @@ 
#define COMEDI_NUM_BOARD_MINORS 0x30

#define COMEDI_FIRST_SUBDEVICE_MINOR COMEDI_NUM_BOARD_MINORS



#define COMEDI_DEVICE_CREATE(cs, parent, devt, drvdata, device, fmt...) \

	device_create(cs, ((parent) ? (parent) : (device)), devt, drvdata, fmt)



struct comedi_subdevice {

	struct comedi_device *device;

	int type;