[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-id: <6fef14ee3d854a995817fe6fde39f14b1d853905.1274088911.git.mina86@mina86.com>
Date: Mon, 17 May 2010 11:48:26 +0200
From: Michal Nazarewicz <m.nazarewicz@...sung.com>
To: Greg KH <greg@...ah.com>, linux-usb@...r.kernel.org
Cc: Kyungmin Park <kyungmin.park@...sung.com>,
Marek Szyprowski <m.szyprowski@...sung.com>,
Linux Kernel <linux-kernel@...r.kernel.org>
Subject: [PATCH] USB: gadget: g_mass_storage: static data instead of dynamic
allocation
From: Michal Nazarewicz <mina86@...a86.com>
This patch changes msg_do_config() function so that it uses
a static object for a fsg_common structure instead of dynamically
allocated. This is a micro-optimisation.
Signed-off-by: Michal Nazarewicz <mina86@...a86.com>
Cc: Kyungmin Park <kyungmin.park@...sung.com>
---
Greg KH wrote:
> This patch doesn't apply. Care to redo it against the linux-next tree?
Hope this works.
drivers/usb/gadget/mass_storage.c | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/drivers/usb/gadget/mass_storage.c b/drivers/usb/gadget/mass_storage.c
index 705cc1f..a3349f2 100644
--- a/drivers/usb/gadget/mass_storage.c
+++ b/drivers/usb/gadget/mass_storage.c
@@ -143,7 +143,7 @@ static int msg_thread_exits(struct fsg_common *common)
static int __init msg_do_config(struct usb_configuration *c)
{
- struct fsg_common *common;
+ static struct fsg_common common, *retp;
struct fsg_config config;
int ret;
@@ -154,12 +154,13 @@ static int __init msg_do_config(struct usb_configuration *c)
fsg_config_from_params(&config, &mod_data);
config.thread_exits = msg_thread_exits;
- common = fsg_common_init(0, c->cdev, &config);
- if (IS_ERR(common))
- return PTR_ERR(common);
- ret = fsg_add(c->cdev, c, common);
- fsg_common_put(common);
+ retp = fsg_common_init(&common, c->cdev, &config);
+ if (IS_ERR(retp))
+ return PTR_ERR(retp);
+
+ ret = fsg_add(c->cdev, c, &common);
+ fsg_common_put(&common);
return ret;
}
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists