staging:iio: Remove unnecessary event_idr and all references (3d550fba) · Commits · jan.koester / Linux

drivers/staging/iio/chrdev.h

+0 −3

Original line number	Original line	Diff line number	Diff line
	@@ -73,8 +73,6 @@ struct iio_shared_ev_pointer {
	* @det_events: list of detected events		* @det_events: list of detected events
	* @max_events: maximum number of events before new ones are dropped		* @max_events: maximum number of events before new ones are dropped
	* @current_events: number of events in detected list		* @current_events: number of events in detected list
	* @id: indentifier to allow the event interface to know which
	* physical line it corresponds to
	* @attr: this chrdev's minor number sysfs attribute		* @attr: this chrdev's minor number sysfs attribute
	* @owner: ensure the driver module owns the file, not iio		* @owner: ensure the driver module owns the file, not iio
	* @private: driver specific data		* @private: driver specific data
	@@ -90,7 +88,6 @@ struct iio_event_interface {
	struct iio_detected_event_list det_events;		struct iio_detected_event_list det_events;
	int max_events;		int max_events;
	int current_events;		int current_events;
	int id;
	struct iio_chrdev_minor_attr attr;		struct iio_chrdev_minor_attr attr;
	struct module *owner;		struct module *owner;
	void *private;		void *private;

drivers/staging/iio/industrialio-core.c

+3 −19

Original line number	Original line	Diff line number	Diff line
	@@ -30,9 +30,6 @@

	/* IDR to assign each registered device a unique id*/		/* IDR to assign each registered device a unique id*/
	static DEFINE_IDR(iio_idr);		static DEFINE_IDR(iio_idr);

	/* IDR for general event identifiers */
	static DEFINE_IDR(iio_event_idr);
	/* IDR to allocate character device minor numbers */		/* IDR to allocate character device minor numbers */
	static DEFINE_IDR(iio_chrdev_idr);		static DEFINE_IDR(iio_chrdev_idr);
	/* Lock used to protect both of the above */		/* Lock used to protect both of the above */
	@@ -654,16 +651,11 @@ static int iio_device_register_eventset(struct iio_dev *dev_info)

	for (i = 0; i < dev_info->num_interrupt_lines; i++) {		for (i = 0; i < dev_info->num_interrupt_lines; i++) {
	dev_info->event_interfaces[i].owner = dev_info->driver_module;		dev_info->event_interfaces[i].owner = dev_info->driver_module;
	ret = iio_get_new_idr_val(&iio_event_idr);
	if (ret < 0)
	goto error_free_setup_ev_ints;
	else
	dev_info->event_interfaces[i].id = ret;

	snprintf(dev_info->event_interfaces[i]._name, 20,		snprintf(dev_info->event_interfaces[i]._name, 20,
	"%s:event%d",		"%s:event%d",
	dev_name(&dev_info->dev),		dev_name(&dev_info->dev),
	dev_info->event_interfaces[i].id);		i);

	ret = iio_setup_ev_int(&dev_info->event_interfaces[i],		ret = iio_setup_ev_int(&dev_info->event_interfaces[i],
	(const char *)(dev_info		(const char *)(dev_info
	@@ -674,8 +666,6 @@ static int iio_device_register_eventset(struct iio_dev *dev_info)
	if (ret) {		if (ret) {
	dev_err(&dev_info->dev,		dev_err(&dev_info->dev,
	"Could not get chrdev interface\n");		"Could not get chrdev interface\n");
	iio_free_idr_val(&iio_event_idr,
	dev_info->event_interfaces[i].id);
	goto error_free_setup_ev_ints;		goto error_free_setup_ev_ints;
	}		}

	@@ -711,11 +701,8 @@ static int iio_device_register_eventset(struct iio_dev *dev_info)
	->event_interfaces[j].dev.kobj,		->event_interfaces[j].dev.kobj,
	&dev_info->event_attrs[j]);		&dev_info->event_attrs[j]);
	error_free_setup_ev_ints:		error_free_setup_ev_ints:
	for (j = 0; j < i; j++) {		for (j = 0; j < i; j++)
	iio_free_idr_val(&iio_event_idr,
	dev_info->event_interfaces[j].id);
	iio_free_ev_int(&dev_info->event_interfaces[j]);		iio_free_ev_int(&dev_info->event_interfaces[j]);
	}
	kfree(dev_info->interrupts);		kfree(dev_info->interrupts);
	error_free_event_interfaces:		error_free_event_interfaces:
	kfree(dev_info->event_interfaces);		kfree(dev_info->event_interfaces);
	@@ -735,11 +722,8 @@ static void iio_device_unregister_eventset(struct iio_dev *dev_info)
	->event_interfaces[i].dev.kobj,		->event_interfaces[i].dev.kobj,
	&dev_info->event_attrs[i]);		&dev_info->event_attrs[i]);

	for (i = 0; i < dev_info->num_interrupt_lines; i++) {		for (i = 0; i < dev_info->num_interrupt_lines; i++)
	iio_free_idr_val(&iio_event_idr,
	dev_info->event_interfaces[i].id);
	iio_free_ev_int(&dev_info->event_interfaces[i]);		iio_free_ev_int(&dev_info->event_interfaces[i]);
	}
	kfree(dev_info->interrupts);		kfree(dev_info->interrupts);
	kfree(dev_info->event_interfaces);		kfree(dev_info->event_interfaces);
	}		}

drivers/staging/iio/industrialio-ring.c

+1 −3

Original line number	Original line	Diff line number	Diff line
	@@ -149,12 +149,10 @@ __iio_request_ring_buffer_event_chrdev(struct iio_ring_buffer *buf,
	{		{
	int ret;		int ret;

	buf->ev_int.id = id;

	snprintf(buf->ev_int._name, sizeof(buf->ev_int._name),		snprintf(buf->ev_int._name, sizeof(buf->ev_int._name),
	"%s:event%d",		"%s:event%d",
	dev_name(&buf->dev),		dev_name(&buf->dev),
	buf->ev_int.id);		id);
	ret = iio_setup_ev_int(&(buf->ev_int),		ret = iio_setup_ev_int(&(buf->ev_int),
	buf->ev_int._name,		buf->ev_int._name,
	owner,		owner,