summaryrefslogtreecommitdiff
path: root/drivers/usb/gadget/g_ffs.c
diff options
context:
space:
mode:
authorAndrzej Pietrasiewicz <andrzej.p@samsung.com>2013-12-03 15:15:31 +0100
committerFelipe Balbi <balbi@ti.com>2013-12-12 13:43:38 -0600
commite72c39c0692d17da4c7f08e20d6c57f7409415f7 (patch)
tree8927d1a7200a7f99ee627f6631cbdfa045fb8d7d /drivers/usb/gadget/g_ffs.c
parente6f3862fa1ecea6579dd1727869655e88be7a5ef (diff)
usb: gadget: FunctionFS: create utility file
A header file to be used by f_fs.c and g_ffs.c will be required when f_fs.c is converted into a module. Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com> Acked-by: Michal Nazarewicz <mina86@mina86.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget/g_ffs.c')
-rw-r--r--drivers/usb/gadget/g_ffs.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/usb/gadget/g_ffs.c b/drivers/usb/gadget/g_ffs.c
index 7099a112c734..1aaa103e01c6 100644
--- a/drivers/usb/gadget/g_ffs.c
+++ b/drivers/usb/gadget/g_ffs.c
@@ -69,13 +69,6 @@ MODULE_LICENSE("GPL");
#define GFS_MAX_DEVS 10
-struct gfs_ffs_obj {
- const char *name;
- bool mounted;
- bool desc_ready;
- struct ffs_data *ffs_data;
-};
-
USB_GADGET_COMPOSITE_OPTIONS();
static struct usb_device_descriptor gfs_dev_desc = {
@@ -181,7 +174,7 @@ static DEFINE_MUTEX(gfs_lock);
static unsigned int missing_funcs;
static bool gfs_registered;
static bool gfs_single_func;
-static struct gfs_ffs_obj *ffs_tab;
+static struct ffs_dev *ffs_tab;
static int __init gfs_init(void)
{
@@ -224,7 +217,7 @@ static void __exit gfs_exit(void)
}
module_exit(gfs_exit);
-static struct gfs_ffs_obj *gfs_find_dev(const char *dev_name)
+static struct ffs_dev *gfs_find_dev(const char *dev_name)
{
int i;
@@ -242,7 +235,7 @@ static struct gfs_ffs_obj *gfs_find_dev(const char *dev_name)
static int functionfs_ready_callback(struct ffs_data *ffs)
{
- struct gfs_ffs_obj *ffs_obj;
+ struct ffs_dev *ffs_obj;
int ret;
ENTER();
@@ -283,7 +276,7 @@ done:
static void functionfs_closed_callback(struct ffs_data *ffs)
{
- struct gfs_ffs_obj *ffs_obj;
+ struct ffs_dev *ffs_obj;
ENTER();
mutex_lock(&gfs_lock);
@@ -305,7 +298,7 @@ done:
static void *functionfs_acquire_dev_callback(const char *dev_name)
{
- struct gfs_ffs_obj *ffs_dev;
+ struct ffs_dev *ffs_dev;
ENTER();
mutex_lock(&gfs_lock);
@@ -329,7 +322,7 @@ done:
static void functionfs_release_dev_callback(struct ffs_data *ffs_data)
{
- struct gfs_ffs_obj *ffs_dev;
+ struct ffs_dev *ffs_dev;
ENTER();
mutex_lock(&gfs_lock);