openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb: gadget: functionfs: replace FFS_SETUP_STATUS with an inline function 

The FFS_SETUP_STATUS macro could be trivialy replaced with an static
inline function but more importantly its name was tad confusing.
The name suggested it was a simple accessor macro but it actually
did change the state of the ffs_data structure perfomring
a FFS_SETUP_CANCELLED -> FFS_NO_SETUP transition.  The name of the
function -- ffs_setup_state_clear_cancelled -- should better
describe what the function actually does.

Signed-off-by: Michal Nazarewicz <mina86@mina86.com>
Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Michal Nazarewicz 2014-02-10 10:42:41 +01:00 committed by Felipe Balbi
parent e46318a000
commit a7ecf0544f
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/usb/gadget/f_fs.c
View File

@ -99,6 +99,14 @@ static struct ffs_function *ffs_func_from_usb(struct usb_function *f)
} }
static inline enum ffs_setup_state
ffs_setup_state_clear_cancelled(struct ffs_data *ffs)
{
return (enum ffs_setup_state)
cmpxchg(&ffs->setup_state, FFS_SETUP_CANCELLED, FFS_NO_SETUP);
}
static void ffs_func_eps_disable(struct ffs_function *func); static void ffs_func_eps_disable(struct ffs_function *func);
static int __must_check ffs_func_eps_enable(struct ffs_function *func); static int __must_check ffs_func_eps_enable(struct ffs_function *func);
@ -246,7 +254,7 @@ static ssize_t ffs_ep0_write(struct file *file, const char __user *buf,
ENTER(); ENTER();
/* Fast check if setup was canceled */ /* Fast check if setup was canceled */
if (FFS_SETUP_STATE(ffs) == FFS_SETUP_CANCELLED) if (ffs_setup_state_clear_cancelled(ffs) == FFS_SETUP_CANCELLED)
return -EIDRM; return -EIDRM;
/* Acquire mutex */ /* Acquire mutex */
@ -312,7 +320,7 @@ static ssize_t ffs_ep0_write(struct file *file, const char __user *buf,
* rather then _irqsave * rather then _irqsave
*/ */
spin_lock_irq(&ffs->ev.waitq.lock); spin_lock_irq(&ffs->ev.waitq.lock);
switch (FFS_SETUP_STATE(ffs)) { switch (ffs_setup_state_clear_cancelled(ffs)) {
case FFS_SETUP_CANCELLED: case FFS_SETUP_CANCELLED:
ret = -EIDRM; ret = -EIDRM;
goto done_spin; goto done_spin;
@ -357,7 +365,8 @@ static ssize_t ffs_ep0_write(struct file *file, const char __user *buf,
* transition can be performed and it's protected by * transition can be performed and it's protected by
* mutex. * mutex.
*/ */
if (FFS_SETUP_STATE(ffs) == FFS_SETUP_CANCELLED) { if (ffs_setup_state_clear_cancelled(ffs) ==
FFS_SETUP_CANCELLED) {
ret = -EIDRM; ret = -EIDRM;
done_spin: done_spin:
spin_unlock_irq(&ffs->ev.waitq.lock); spin_unlock_irq(&ffs->ev.waitq.lock);
@ -423,7 +432,7 @@ static ssize_t ffs_ep0_read(struct file *file, char __user *buf,
ENTER(); ENTER();
/* Fast check if setup was canceled */ /* Fast check if setup was canceled */
if (FFS_SETUP_STATE(ffs) == FFS_SETUP_CANCELLED) if (ffs_setup_state_clear_cancelled(ffs) == FFS_SETUP_CANCELLED)
return -EIDRM; return -EIDRM;
/* Acquire mutex */ /* Acquire mutex */
@ -443,7 +452,7 @@ static ssize_t ffs_ep0_read(struct file *file, char __user *buf,
*/ */
spin_lock_irq(&ffs->ev.waitq.lock); spin_lock_irq(&ffs->ev.waitq.lock);
switch (FFS_SETUP_STATE(ffs)) { switch (ffs_setup_state_clear_cancelled(ffs)) {
case FFS_SETUP_CANCELLED: case FFS_SETUP_CANCELLED:
ret = -EIDRM; ret = -EIDRM;
break; break;
@ -491,7 +500,8 @@ static ssize_t ffs_ep0_read(struct file *file, char __user *buf,
spin_lock_irq(&ffs->ev.waitq.lock); spin_lock_irq(&ffs->ev.waitq.lock);
/* See ffs_ep0_write() */ /* See ffs_ep0_write() */
if (FFS_SETUP_STATE(ffs) == FFS_SETUP_CANCELLED) { if (ffs_setup_state_clear_cancelled(ffs) ==
FFS_SETUP_CANCELLED) {
ret = -EIDRM; ret = -EIDRM;
break; break;
} }

7
drivers/usb/gadget/u_fs.h
View File

@ -172,13 +172,12 @@ struct ffs_data {
* happens only in ep0 i/o which is P: mutex * happens only in ep0 i/o which is P: mutex
* + FFS_SETUP_PENDING -> FFS_SETUP_CANCELLED -- P: ev.waitq.lock * + FFS_SETUP_PENDING -> FFS_SETUP_CANCELLED -- P: ev.waitq.lock
* + FFS_SETUP_CANCELLED -> FFS_NO_SETUP -- cmpxchg * + FFS_SETUP_CANCELLED -> FFS_NO_SETUP -- cmpxchg
*
* This field should never be accessed directly and instead
* ffs_setup_state_clear_cancelled function should be used.
*/ */
enum ffs_setup_state setup_state; enum ffs_setup_state setup_state;
#define FFS_SETUP_STATE(ffs) \
((enum ffs_setup_state)cmpxchg(&(ffs)->setup_state, \
FFS_SETUP_CANCELLED, FFS_NO_SETUP))
/* Events & such. */ /* Events & such. */
struct { struct {
u8 types[4]; u8 types[4];