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

Commit ddf1ffbd authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Input: serio - let device core tell us if device was registered 



No need to keep track of it by ourselves.

Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 386d8772

drivers/input/serio/serio.c

+2 −6
Original line number Original line Diff line number Diff line
@@ -577,8 +577,6 @@ static void serio_add_port(struct serio *serio) 
		printk(KERN_ERR

		printk(KERN_ERR

			"serio: device_add() failed for %s (%s), error: %d\n",

			"serio: device_add() failed for %s (%s), error: %d\n",

			serio->phys, serio->name, error);

			serio->phys, serio->name, error);

	else

		serio->registered = true;

}

}





/*

/*
@@ -605,10 +603,8 @@ static void serio_destroy_port(struct serio *serio) 
		serio->parent = NULL;

		serio->parent = NULL;

	}

	}





	if (serio->registered) {

	if (device_is_registered(&serio->dev))

		device_del(&serio->dev);

		device_del(&serio->dev);

		serio->registered = false;

	}





	list_del_init(&serio->node);

	list_del_init(&serio->node);

	serio_remove_pending_events(serio);

	serio_remove_pending_events(serio);
@@ -995,7 +991,7 @@ irqreturn_t serio_interrupt(struct serio *serio, 




        if (likely(serio->drv)) {

        if (likely(serio->drv)) {

                ret = serio->drv->interrupt(serio, data, dfl);

                ret = serio->drv->interrupt(serio, data, dfl);

	} else if (!dfl && serio->registered) {

	} else if (!dfl && device_is_registered(&serio->dev)) {

		serio_rescan(serio);

		serio_rescan(serio);

		ret = IRQ_HANDLED;

		ret = IRQ_HANDLED;

	}

	}

include/linux/serio.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,6 @@ struct serio { 
	char phys[32];

	char phys[32];





	bool manual_bind;

	bool manual_bind;

	bool registered;	/* port has been fully registered with driver core */





	struct serio_device_id id;

	struct serio_device_id id;