Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752259AbaBCPCP (ORCPT ); Mon, 3 Feb 2014 10:02:15 -0500 Received: from mail-ie0-f171.google.com ([209.85.223.171]:65316 "EHLO mail-ie0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751483AbaBCPCN (ORCPT ); Mon, 3 Feb 2014 10:02:13 -0500 MIME-Version: 1.0 In-Reply-To: <1391316630-29541-8-git-send-email-benjamin.tissoires@redhat.com> References: <1391316630-29541-1-git-send-email-benjamin.tissoires@redhat.com> <1391316630-29541-8-git-send-email-benjamin.tissoires@redhat.com> Date: Mon, 3 Feb 2014 16:02:13 +0100 Message-ID: Subject: Re: [PATCH 07/11] HID: HIDp: remove duplicated coded From: David Herrmann To: Benjamin Tissoires Cc: Benjamin Tissoires , Jiri Kosina , Frank Praznik , "open list:HID CORE LAYER" , linux-kernel Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Hi On Sun, Feb 2, 2014 at 5:50 AM, Benjamin Tissoires wrote: > - Move hidp_output_report() above > - Removed duplicated code in hidp_output_raw_report() > > Signed-off-by: Benjamin Tissoires > --- > net/bluetooth/hidp/core.c | 68 ++++++++--------------------------------------- > 1 file changed, 11 insertions(+), 57 deletions(-) > > diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c > index 469e61b..02670b3 100644 > --- a/net/bluetooth/hidp/core.c > +++ b/net/bluetooth/hidp/core.c > @@ -373,62 +373,25 @@ err: > return ret; > } > > -static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, size_t count, > - unsigned char report_type) > +static int hidp_output_report(struct hid_device *hid, __u8 *data, size_t count) > { > struct hidp_session *session = hid->driver_data; > - int ret; > > + return hidp_send_intr_message(session, > + HIDP_TRANS_DATA | HIDP_DATA_RTYPE_OUPUT, > + data, count); > +} > + > +static int hidp_output_raw_report(struct hid_device *hid, unsigned char *data, > + size_t count, unsigned char report_type) > +{ > if (report_type == HID_OUTPUT_REPORT) { > - report_type = HIDP_TRANS_DATA | HIDP_DATA_RTYPE_OUPUT; > - return hidp_send_intr_message(session, report_type, > - data, count); > + return hidp_output_report(hid, data, count); NAK, that does not work with BT. hidp_output_raw_report() can do both, a synchronous SET_REPORT and an async OUTPUT_REPORT. It's currently screwed up, as for RTYPE_OUTPUT it uses the intr-channel, for RTYPE_FEATURE the ctrl-channel. This function is exactly the reason why we added raw_report() and output_report(). So I'd like to keep it as it and just remove it once we have no more users of hidp_output_raw_report(). Thanks David > } else if (report_type != HID_FEATURE_REPORT) { > return -EINVAL; > } > > - if (mutex_lock_interruptible(&session->report_mutex)) > - return -ERESTARTSYS; > - > - /* Set up our wait, and send the report request to the device. */ > - set_bit(HIDP_WAITING_FOR_SEND_ACK, &session->flags); > - report_type = HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE; > - ret = hidp_send_ctrl_message(session, report_type, data, count); > - if (ret) > - goto err; > - > - /* Wait for the ACK from the device. */ > - while (test_bit(HIDP_WAITING_FOR_SEND_ACK, &session->flags) && > - !atomic_read(&session->terminate)) { > - int res; > - > - res = wait_event_interruptible_timeout(session->report_queue, > - !test_bit(HIDP_WAITING_FOR_SEND_ACK, &session->flags) > - || atomic_read(&session->terminate), > - 10*HZ); > - if (res == 0) { > - /* timeout */ > - ret = -EIO; > - goto err; > - } > - if (res < 0) { > - /* signal */ > - ret = -ERESTARTSYS; > - goto err; > - } > - } > - > - if (!session->output_report_success) { > - ret = -EIO; > - goto err; > - } > - > - ret = count; > - > -err: > - clear_bit(HIDP_WAITING_FOR_SEND_ACK, &session->flags); > - mutex_unlock(&session->report_mutex); > - return ret; > + return hidp_set_raw_report(hid, data[0], data, count, report_type); > } > > static int hidp_raw_request(struct hid_device *hid, unsigned char reportnum, > @@ -445,15 +408,6 @@ static int hidp_raw_request(struct hid_device *hid, unsigned char reportnum, > } > } > > -static int hidp_output_report(struct hid_device *hid, __u8 *data, size_t count) > -{ > - struct hidp_session *session = hid->driver_data; > - > - return hidp_send_intr_message(session, > - HIDP_TRANS_DATA | HIDP_DATA_RTYPE_OUPUT, > - data, count); > -} > - > static void hidp_idle_timeout(unsigned long arg) > { > struct hidp_session *session = (struct hidp_session *) arg; > -- > 1.8.3.1 > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/