lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

net/atm/ioctl.c: checkpatch cleanups

Browse Source 
Spacing cleanups
Moved EXPORT_SYMBOL
Mostly 80 column wrapped.
switch/case cleanups

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Joe Perches
2010-01-26 11:40:07 +00:00
committed by David S. Miller
parent a8147d737b
commit 5ff7ef7911
1 changed files with 97 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
net/atm/ioctl.c
View File

@@ -37,6 +37,7 @@ void register_atm_ioctl(struct atm_ioctl *ioctl)
list_add_tail(&ioctl->list, &ioctl_list); list_add_tail(&ioctl->list, &ioctl_list);
mutex_unlock(&ioctl_mutex); mutex_unlock(&ioctl_mutex);
} }
EXPORT_SYMBOL(register_atm_ioctl);
void deregister_atm_ioctl(struct atm_ioctl *ioctl) void deregister_atm_ioctl(struct atm_ioctl *ioctl)
{ {
@@ -44,16 +45,15 @@ void deregister_atm_ioctl(struct atm_ioctl *ioctl)
list_del(&ioctl->list); list_del(&ioctl->list);
mutex_unlock(&ioctl_mutex); mutex_unlock(&ioctl_mutex);
} }
EXPORT_SYMBOL(register_atm_ioctl);
EXPORT_SYMBOL(deregister_atm_ioctl); EXPORT_SYMBOL(deregister_atm_ioctl);
static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg, int compat) static int do_vcc_ioctl(struct socket *sock, unsigned int cmd,
unsigned long arg, int compat)
{ {
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
struct atm_vcc *vcc; struct atm_vcc *vcc;
int error; int error;
struct list_head * pos; struct list_head *pos;
void __user *argp = (void __user *)arg; void __user *argp = (void __user *)arg;
vcc = ATM_SD(sock); vcc = ATM_SD(sock);
@@ -65,7 +65,7 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg
goto done; goto done;
} }
error = put_user(sk->sk_sndbuf - sk_wmem_alloc_get(sk), error = put_user(sk->sk_sndbuf - sk_wmem_alloc_get(sk),
(int __user *) argp) ? -EFAULT : 0; (int __user *)argp) ? -EFAULT : 0;
goto done; goto done;
case SIOCINQ: case SIOCINQ:
{ {
@@ -137,7 +137,7 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg
case ATM_NEWBACKENDIF: case ATM_NEWBACKENDIF:
{ {
atm_backend_t backend; atm_backend_t backend;
error = get_user(backend, (atm_backend_t __user *) argp); error = get_user(backend, (atm_backend_t __user *)argp);
if (error) if (error)
goto done; goto done;
switch (backend) { switch (backend) {
@@ -148,8 +148,8 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg
request_module("br2684"); request_module("br2684");
break; break;
} }
}
break; break;
}
case ATMMPC_CTRL: case ATMMPC_CTRL:
case ATMMPC_DATA: case ATMMPC_DATA:
request_module("mpoa"); request_module("mpoa");
@@ -166,7 +166,7 @@ static int do_vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg
mutex_lock(&ioctl_mutex); mutex_lock(&ioctl_mutex);
list_for_each(pos, &ioctl_list) { list_for_each(pos, &ioctl_list) {
struct atm_ioctl * ic = list_entry(pos, struct atm_ioctl, list); struct atm_ioctl *ic = list_entry(pos, struct atm_ioctl, list);
if (try_module_get(ic->owner)) { if (try_module_get(ic->owner)) {
error = ic->ioctl(sock, cmd, arg); error = ic->ioctl(sock, cmd, arg);
module_put(ic->owner); module_put(ic->owner);
@@ -185,7 +185,6 @@ done:
return error; return error;
} }
int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg) int vcc_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)
{ {
return do_vcc_ioctl(sock, cmd, arg, 0); return do_vcc_ioctl(sock, cmd, arg, 0);
@@ -288,8 +287,8 @@ static int do_atmif_sioc(struct socket *sock, unsigned int cmd,
sioc = compat_alloc_user_space(sizeof(*sioc)); sioc = compat_alloc_user_space(sizeof(*sioc));
sioc32 = compat_ptr(arg); sioc32 = compat_ptr(arg);
if (copy_in_user(&sioc->number, &sioc32->number, 2 * sizeof(int)) if (copy_in_user(&sioc->number, &sioc32->number, 2 * sizeof(int)) ||
|| get_user(data, &sioc32->arg)) get_user(data, &sioc32->arg))
return -EFAULT; return -EFAULT;
datap = compat_ptr(data); datap = compat_ptr(data);
if (put_user(datap, &sioc->arg)) if (put_user(datap, &sioc->arg))