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

Commit f65cc544 authored by Ian Abbott's avatar Ian Abbott Committed by Greg Kroah-Hartman
Browse files

staging: comedi: change comedi_alloc_subdevice_minor parameters 



`comedi_alloc_subdevice_minor()` doesn't really need a parameter
pointing to a `struct comedi_device` as it can get this information from
the parameter pointing to a `struct comedi_subdevice`.  Just pass the
subdevice parameter.

Signed-by: default avatarIan Abbott <abbotti@mev.co.uk>

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e9ab1c2f

drivers/staging/comedi/comedi_fops.c

+2 −2
Original line number Diff line number Diff line
@@ -2352,9 +2352,9 @@ int comedi_find_board_minor(struct device *hardware_device) 
	return -ENODEV;

}



int comedi_alloc_subdevice_minor(struct comedi_device *dev,

				 struct comedi_subdevice *s)

int comedi_alloc_subdevice_minor(struct comedi_subdevice *s)

{

	struct comedi_device *dev = s->device;

	struct comedi_file_info *info;

	struct device *csdev;

	unsigned i;

drivers/staging/comedi/comedi_internal.h

+1 −2
Original line number Diff line number Diff line
@@ -11,8 +11,7 @@ int do_rangeinfo_ioctl(struct comedi_device *dev, 
int comedi_alloc_board_minor(struct device *hardware_device);

void comedi_free_board_minor(unsigned minor);

int comedi_find_board_minor(struct device *hardware_device);

int comedi_alloc_subdevice_minor(struct comedi_device *dev,

				 struct comedi_subdevice *s);

int comedi_alloc_subdevice_minor(struct comedi_subdevice *s);

void comedi_free_subdevice_minor(struct comedi_subdevice *s);



int comedi_buf_alloc(struct comedi_device *dev, struct comedi_subdevice *s,

drivers/staging/comedi/drivers.c

+1 −1
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ static int __comedi_device_postconfig_async(struct comedi_device *dev, 
			return ret;

	}



	comedi_alloc_subdevice_minor(dev, s);

	comedi_alloc_subdevice_minor(s);



	return 0;

}