On Wed, Oct 23 2013, Andrzej Pietrasiewicz wrote: > 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 <andrze...@samsung.com> > Signed-off-by: Kyungmin Park <kyungmin.p...@samsung.com>
Acked-by: Michal Nazarewicz <min...@mina86.com>
> ---
> drivers/usb/gadget/f_fs.c | 1 +
> drivers/usb/gadget/g_ffs.c | 19 ++++++-------------
> drivers/usb/gadget/u_fs.h | 28 ++++++++++++++++++++++++++++
> 3 files changed, 35 insertions(+), 13 deletions(-)
> create mode 100644 drivers/usb/gadget/u_fs.h
>
> diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
> index 9ccda73..c380662 100644
> --- a/drivers/usb/gadget/f_fs.c
> +++ b/drivers/usb/gadget/f_fs.c
> @@ -27,6 +27,7 @@
> #include <linux/usb/composite.h>
> #include <linux/usb/functionfs.h>
>
> +#include "u_fs.h"
>
> #define FUNCTIONFS_MAGIC 0xa647361 /* Chosen by a honest dice roll ;) */
>
> diff --git a/drivers/usb/gadget/g_ffs.c b/drivers/usb/gadget/g_ffs.c
> index 5d13330..bf8f1aa 100644
> --- a/drivers/usb/gadget/g_ffs.c
> +++ b/drivers/usb/gadget/g_ffs.c
> @@ -70,13 +70,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 = {
> @@ -182,7 +175,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)
> {
> @@ -225,7 +218,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;
>
> @@ -243,7 +236,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();
> @@ -284,7 +277,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);
> @@ -306,7 +299,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);
> @@ -330,7 +323,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);
> diff --git a/drivers/usb/gadget/u_fs.h b/drivers/usb/gadget/u_fs.h
> new file mode 100644
> index 0000000..5d9229a
> --- /dev/null
> +++ b/drivers/usb/gadget/u_fs.h
> @@ -0,0 +1,28 @@
> +/*
> + * u_fs.h
> + *
> + * Utility definitions for the FunctionFS
> + *
> + * Copyright (c) 2013 Samsung Electronics Co., Ltd.
> + * http://www.samsung.com
> + *
> + * Author: Andrzej Pietrasiewicz <andrze...@samsung.com>
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License version 2 as
> + * published by the Free Software Foundation.
> + */
> +
> +#ifndef U_FFS_H
> +#define U_FFS_H
> +
> +#include <linux/usb/composite.h>
> +
> +struct ffs_dev {
> + const char *name;
> + bool mounted;
> + bool desc_ready;
> + struct ffs_data *ffs_data;
> +};
> +
> +#endif /* U_FFS_H */
> --
> 1.7.0.4
signature.asc
Description: PGP signature
