Re: [PATCHv3 03/18] Bluetooth: Remove unnecessary intermediate function
From: Andrei Emeltchenko <hidden>
Date: 2012-10-19 07:56:35
Hi Mat, On Thu, Oct 18, 2012 at 10:58:35AM -0700, Mat Martineau wrote:
Resolves a conflict resolution issue in "Bluetooth: Fix L2CAP coding style".
I would name commit message rather "Refactoring l2cap chan create and connect functions.."
Signed-off-by: Mat Martineau <redacted> Acked-by: Marcel Holtmann <marcel@holtmann.org>
Otherwise Acked-by: Andrei Emeltchenko <redacted>
quoted hunk ↗ jump to hunk
--- net/bluetooth/l2cap_core.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-)diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c index 73ce337..ec2b4d9 100644 --- a/net/bluetooth/l2cap_core.c +++ b/net/bluetooth/l2cap_core.c@@ -3537,7 +3537,7 @@ static int l2cap_connect_req(struct l2cap_conn *conn, return 0; } -static inline int l2cap_connect_rsp(struct l2cap_conn *conn, +static int l2cap_connect_create_rsp(struct l2cap_conn *conn, struct l2cap_cmd_hdr *cmd, u8 *data) { struct l2cap_conn_rsp *rsp = (struct l2cap_conn_rsp *) data;@@ -4091,15 +4091,6 @@ static int l2cap_create_channel_req(struct l2cap_conn *conn, return 0; } -static inline int l2cap_create_channel_rsp(struct l2cap_conn *conn, - struct l2cap_cmd_hdr *cmd, - void *data) -{ - BT_DBG("conn %p", conn); - - return l2cap_connect_rsp(conn, cmd, data); -} - static void l2cap_send_move_chan_rsp(struct l2cap_conn *conn, u8 ident, u16 icid, u16 result) {@@ -4306,7 +4297,7 @@ static inline int l2cap_bredr_sig_cmd(struct l2cap_conn *conn, case L2CAP_CONN_RSP: case L2CAP_CREATE_CHAN_RSP: - err = l2cap_connect_rsp(conn, cmd, data); + err = l2cap_connect_create_rsp(conn, cmd, data); break; case L2CAP_CONF_REQ:-- 1.7.12.3 -- Mat Martineau Employee of Qualcomm Innovation Center, Inc. The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation