mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: stefani@seibold.net
To: linux-kernel@vger.kernel.org, gregkh@linuxfoundation.org,
	oneukum@suse.de
Cc: alan@lxorguk.ukuu.org.uk, linux-usb@vger.kernel.org,
	Stefani Seibold <stefani@seibold.net>
Subject: [PATCH 04/11] remove usb_interface pointer
Date: Wed,  6 Jun 2012 18:27:05 +0200	[thread overview]
Message-ID: <1339000032-10313-5-git-send-email-stefani@seibold.net> (raw)
In-Reply-To: <1339000032-10313-1-git-send-email-stefani@seibold.net>

From: Stefani Seibold <stefani@seibold.net>

this saves a litte bit of memory space in the driver devices structure

Signed-off-by: Stefani Seibold <stefani@seibold.net>
---
 drivers/usb/usb-skeleton.c |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/drivers/usb/usb-skeleton.c b/drivers/usb/usb-skeleton.c
index 2f17991..f7fe32f 100644
--- a/drivers/usb/usb-skeleton.c
+++ b/drivers/usb/usb-skeleton.c
@@ -49,7 +49,6 @@ MODULE_DEVICE_TABLE(usb, skel_table);
 /* Structure to hold all of our device specific stuff */
 struct usb_skel {
 	struct usb_device	*udev;			/* the usb device for this device */
-	struct usb_interface	*interface;		/* the interface for this device */
 	struct semaphore	limit_sem;		/* limiting the number of writes in progress */
 	struct usb_anchor	submitted;		/* in case we need to retract our submissions */
 	struct urb		*bulk_in_urb;		/* the urb to read data with */
@@ -61,6 +60,7 @@ struct usb_skel {
 	__u8			bulk_out_endpointAddr;	/* the address of the bulk out endpoint */
 	int			errors;			/* the last request tanked */
 	bool			ongoing_read;		/* a read is going on */
+	bool			connected;		/* connected flag */
 	spinlock_t		err_lock;		/* lock for errors */
 	struct kref		kref;
 	struct mutex		io_mutex;		/* synchronize I/O with disconnect */
@@ -129,8 +129,9 @@ static int skel_release(struct inode *inode, struct file *file)
 
 	/* allow the device to be autosuspended */
 	mutex_lock(&dev->io_mutex);
-	if (dev->interface)
-		usb_autopm_put_interface(dev->interface);
+	if (dev->connected)
+		usb_autopm_put_interface(
+			usb_find_interface(&skel_driver, iminor(inode)));
 	mutex_unlock(&dev->io_mutex);
 
 	/* decrement the count on our device */
@@ -170,7 +171,7 @@ static void skel_read_bulk_callback(struct urb *urb)
 		if (!(urb->status == -ENOENT ||
 		    urb->status == -ECONNRESET ||
 		    urb->status == -ESHUTDOWN))
-			dev_err(&dev->interface->dev,
+			dev_err(&urb->dev->dev,
 				"%s - nonzero write bulk status received: %d\n",
 				__func__, urb->status);
 
@@ -205,7 +206,7 @@ static int skel_do_read_io(struct usb_skel *dev, size_t count)
 	/* do it */
 	retval = usb_submit_urb(dev->bulk_in_urb, GFP_KERNEL);
 	if (retval < 0) {
-		dev_err(&dev->interface->dev,
+		dev_err(&dev->udev->dev,
 			"%s - failed submitting read urb, error %d\n",
 			__func__, retval);
 		dev->bulk_in_filled = 0;
@@ -234,7 +235,7 @@ static ssize_t skel_read(struct file *file, char *buffer, size_t count,
 	if (retval < 0)
 		return retval;
 
-	if (!dev->interface) {		/* disconnect() was called */
+	if (!dev->connected) {		/* disconnect() was called */
 		retval = -ENODEV;
 		goto exit;
 	}
@@ -344,7 +345,7 @@ static void skel_write_bulk_callback(struct urb *urb)
 		if (!(urb->status == -ENOENT ||
 		    urb->status == -ECONNRESET ||
 		    urb->status == -ESHUTDOWN))
-			dev_err(&dev->interface->dev,
+			dev_err(&urb->dev->dev,
 				"%s - nonzero write bulk status received: %d\n",
 				__func__, urb->status);
 
@@ -421,7 +422,7 @@ static ssize_t skel_write(struct file *file, const char *user_buffer,
 
 	/* this lock makes sure we don't submit URBs to gone devices */
 	mutex_lock(&dev->io_mutex);
-	if (!dev->interface) {		/* disconnect() was called */
+	if (!dev->connected) {		/* disconnect() was called */
 		mutex_unlock(&dev->io_mutex);
 		retval = -ENODEV;
 		goto error;
@@ -438,7 +439,7 @@ static ssize_t skel_write(struct file *file, const char *user_buffer,
 	retval = usb_submit_urb(urb, GFP_KERNEL);
 	mutex_unlock(&dev->io_mutex);
 	if (retval) {
-		dev_err(&dev->interface->dev,
+		dev_err(&dev->udev->dev,
 			"%s - failed submitting write urb, error %d\n",
 			__func__, retval);
 		goto error_unanchor;
@@ -510,7 +511,7 @@ static int skel_probe(struct usb_interface *interface,
 	init_completion(&dev->bulk_in_completion);
 
 	dev->udev = usb_get_dev(interface_to_usbdev(interface));
-	dev->interface = interface;
+	dev->connected = true;
 
 	/* set up the endpoint information */
 	/* use only the first bulk-in and bulk-out endpoints */
@@ -589,7 +590,7 @@ static void skel_disconnect(struct usb_interface *interface)
 
 	/* prevent more I/O from starting */
 	mutex_lock(&dev->io_mutex);
-	dev->interface = NULL;
+	dev->connected = false;
 	mutex_unlock(&dev->io_mutex);
 
 	usb_kill_anchored_urbs(&dev->submitted);
-- 
1.7.8.6


  parent reply	other threads:[~2012-06-06 16:28 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-06 16:27 [PATCH] fix usb skeleton driver stefani
2012-06-06 16:27 ` [PATCH 01/11] fix wrong label in skel_open stefani
2012-06-06 18:52   ` Oliver Neukum
2012-06-06 19:59     ` Stefani Seibold
2012-06-06 16:27 ` [PATCH 02/11] code cleanup stefani
2012-06-06 18:57   ` Oliver Neukum
2012-06-06 16:27 ` [PATCH 03/11] remove dead code stefani
2012-06-06 16:27 ` stefani [this message]
2012-06-06 18:59   ` [PATCH 04/11] remove usb_interface pointer Oliver Neukum
2012-06-06 20:04     ` Stefani Seibold
2012-06-06 20:19       ` Alan Stern
2012-06-06 22:54   ` Greg KH
2012-06-07  8:07     ` Stefani Seibold
2012-06-07 11:51     ` Stefani Seibold
2012-06-07 14:28       ` Alan Stern
2012-06-07 15:03         ` Stefani Seibold
2012-06-07 15:27           ` Alan Stern
2012-06-07 19:50             ` Stefani Seibold
2012-06-07 20:42               ` Alan Stern
2012-06-08  7:18               ` RFC: remove usb_device pointer from usb_skeleton.c Stefani Seibold
2012-06-08  8:28                 ` Oliver Neukum
2012-06-08 13:46                 ` Alan Stern
2012-06-06 16:27 ` [PATCH 05/11] remove unneeded forward declaration stefani
2012-06-06 16:27 ` [PATCH 06/11] introduce fsync function stefani
2012-06-06 16:27 ` [PATCH 07/11] remove pr_err() noise in skel_open stefani
2012-06-06 16:27 ` [PATCH 08/11] Handle a non blocking read without blocking stefani
2012-06-06 16:27 ` [PATCH 09/11] Synchronize disconnect() handler with open() and release(), to fix races stefani
2012-06-06 16:27 ` [PATCH 10/11] Introduce single user mode stefani
2012-06-06 16:27 ` [PATCH 11/11] Bump version number and add aditional author stefani
2012-06-06 16:55 ` [PATCH] fix usb skeleton driver Alan Stern
2012-06-06 17:53   ` Stefani Seibold
2012-06-06 18:16     ` Alan Stern
2012-06-06 20:19       ` Stefani Seibold
2012-06-06 20:22         ` Alan Stern
2012-06-07  8:13           ` Stefani Seibold
2012-06-07  7:10         ` Bjørn Mork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1339000032-10313-5-git-send-email-stefani@seibold.net \
    --to=stefani@seibold.net \
    --cc=alan@lxorguk.ukuu.org.uk \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=oneukum@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®