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

Bluetooth: fix errors reported by checkpatch.pl

Browse Source 
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Gustavo F. Padovan
2011-02-17 19:16:55 -03:00
parent 138d22ef14
commit e2174ca430
2 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
net/bluetooth/l2cap_core.c
View File

@@ -1671,10 +1671,6 @@ done:
break; break;
} }
/* FIXME: Need actual value of the flush timeout */
//if (flush_to != L2CAP_DEFAULT_FLUSH_TO)
// l2cap_add_conf_opt(&ptr, L2CAP_CONF_FLUSH_TO, 2, pi->flush_to);
req->dcid = cpu_to_le16(pi->dcid); req->dcid = cpu_to_le16(pi->dcid);
req->flags = cpu_to_le16(0); req->flags = cpu_to_le16(0);
@@ -2501,7 +2497,7 @@ static inline int l2cap_information_rsp(struct l2cap_conn *conn, struct l2cap_cm
return 0; return 0;
} }
static int inline l2cap_check_conn_param(u16 min, u16 max, u16 latency, static inline int l2cap_check_conn_param(u16 min, u16 max, u16 latency,
u16 to_multiplier) u16 to_multiplier)
{ {
u16 max_latency; u16 max_latency;
@@ -2539,8 +2535,8 @@ static inline int l2cap_conn_param_update_req(struct l2cap_conn *conn,
return -EPROTO; return -EPROTO;
req = (struct l2cap_conn_param_update_req *) data; req = (struct l2cap_conn_param_update_req *) data;
min = __le16_to_cpu(req->min); min = __le16_to_cpu(req->min);
max = __le16_to_cpu(req->max); max = __le16_to_cpu(req->max);
latency = __le16_to_cpu(req->latency); latency = __le16_to_cpu(req->latency);
to_multiplier = __le16_to_cpu(req->to_multiplier); to_multiplier = __le16_to_cpu(req->to_multiplier);

30
net/bluetooth/l2cap_sock.c
View File

@@ -1127,30 +1127,30 @@ static const struct net_proto_family l2cap_sock_family_ops = {
int __init l2cap_init_sockets(void) int __init l2cap_init_sockets(void)
{ {
int err; int err;
err = proto_register(&l2cap_proto, 0); err = proto_register(&l2cap_proto, 0);
if (err < 0) if (err < 0)
return err; return err;
err = bt_sock_register(BTPROTO_L2CAP, &l2cap_sock_family_ops); err = bt_sock_register(BTPROTO_L2CAP, &l2cap_sock_family_ops);
if (err < 0) if (err < 0)
goto error; goto error;
BT_INFO("L2CAP socket layer initialized"); BT_INFO("L2CAP socket layer initialized");
return 0; return 0;
error: error:
BT_ERR("L2CAP socket registration failed"); BT_ERR("L2CAP socket registration failed");
proto_unregister(&l2cap_proto); proto_unregister(&l2cap_proto);
return err; return err;
} }
void l2cap_cleanup_sockets(void) void l2cap_cleanup_sockets(void)
{ {
if (bt_sock_unregister(BTPROTO_L2CAP) < 0) if (bt_sock_unregister(BTPROTO_L2CAP) < 0)
BT_ERR("L2CAP socket unregistration failed"); BT_ERR("L2CAP socket unregistration failed");
proto_unregister(&l2cap_proto); proto_unregister(&l2cap_proto);
} }