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

Commit 3a90f818 authored by Oliver Neukum's avatar Oliver Neukum Committed by Greg Kroah-Hartman
Browse files

USB: usblp: Remove checks no longer needed with the new runtime PM system 



Under the new system a device cannot be suspended against
the driver's wish. Therefore this condition no longer needs
to be checked for.

Signed-off-by: default avatarOliver Neukum <oliver@neukum.org>
Cc: Pete Zaitcev <zaitcev@redhat.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent c1284d77

drivers/usb/class/usblp.c

+3 −17
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ struct usblp { 
	unsigned char		used;			/* True if open */

	unsigned char		present;		/* True if not disconnected */

	unsigned char		bidir;			/* interface is bidirectional */

	unsigned char		sleeping;		/* interface is suspended */

	unsigned char		no_paper;		/* Paper Out happened */

	unsigned char		*device_id_string;	/* IEEE 1284 DEVICE ID string (ptr) */

							/* first 2 bytes are (big-endian) length */
@@ -191,7 +190,6 @@ static void usblp_dump(struct usblp *usblp) { 
	dbg("quirks=%d", usblp->quirks);

	dbg("used=%d", usblp->used);

	dbg("bidir=%d", usblp->bidir);

	dbg("sleeping=%d", usblp->sleeping);

	dbg("device_id_string=\"%s\"",

		usblp->device_id_string ?

			usblp->device_id_string + 2 :
@@ -376,7 +374,7 @@ static int usblp_check_status(struct usblp *usblp, int err) 


static int handle_bidir (struct usblp *usblp)

{

	if (usblp->bidir && usblp->used && !usblp->sleeping) {

	if (usblp->bidir && usblp->used) {

		if (usblp_submit_read(usblp) < 0)

			return -EIO;

	}
@@ -503,11 +501,6 @@ static long usblp_ioctl(struct file *file, unsigned int cmd, unsigned long arg) 
		goto done;

	}



	if (usblp->sleeping) {

		retval = -ENODEV;

		goto done;

	}



	dbg("usblp_ioctl: cmd=0x%x (%c nr=%d len=%d dir=%d)", cmd, _IOC_TYPE(cmd),

		_IOC_NR(cmd), _IOC_SIZE(cmd), _IOC_DIR(cmd) );
@@ -914,8 +907,6 @@ static int usblp_wtest(struct usblp *usblp, int nonblock) 
		return 0;

	}

	spin_unlock_irqrestore(&usblp->lock, flags);

	if (usblp->sleeping)

		return -ENODEV;

	if (nonblock)

		return -EAGAIN;

	return 1;
@@ -968,8 +959,6 @@ static int usblp_rtest(struct usblp *usblp, int nonblock) 
		return 0;

	}

	spin_unlock_irqrestore(&usblp->lock, flags);

	if (usblp->sleeping)

		return -ENODEV;

	if (nonblock)

		return -EAGAIN;

	return 1;
@@ -1381,8 +1370,6 @@ static int usblp_suspend (struct usb_interface *intf, pm_message_t message) 
{

	struct usblp *usblp = usb_get_intfdata (intf);



	/* we take no more IO */

	usblp->sleeping = 1;

	usblp_unlink_urbs(usblp);

#if 0 /* XXX Do we want this? What if someone is reading, should we fail? */

	/* not strictly necessary, but just in case */
@@ -1398,7 +1385,6 @@ static int usblp_resume (struct usb_interface *intf) 
	struct usblp *usblp = usb_get_intfdata (intf);

	int r;



	usblp->sleeping = 0;

	r = handle_bidir (usblp);



	return r;