From patchwork Wed Sep 10 18:41:26 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ping Cheng X-Patchwork-Id: 4879641 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 456D59F390 for ; Wed, 10 Sep 2014 18:41:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5C17E20142 for ; Wed, 10 Sep 2014 18:41:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C16220123 for ; Wed, 10 Sep 2014 18:41:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752410AbaIJSld (ORCPT ); Wed, 10 Sep 2014 14:41:33 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:49890 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752398AbaIJSld (ORCPT ); Wed, 10 Sep 2014 14:41:33 -0400 Received: by mail-pa0-f46.google.com with SMTP id kq14so5204755pab.19 for ; Wed, 10 Sep 2014 11:41:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=NoDRdlabL+7ND/6S+Ue0NlP88ZI4AxRJdvvVVDkO9HM=; b=H+ZvuxGTLfd6QurTE8Xm2P8kZo2AvkZ6E6RgiiQl+JQF7+OGSow8vzjrHXHpSfb0fS uvwIQqTwo1FFSuJLpF1QA/+2swpsUV2H3FHPrmXyb58nXdz+NEWsSP6ahTqY8/dynvUC 3uXq2pPdtnODZj5qTtQGii14DqWqWxMQUd/PK6dm9ZCUJmWmyjelnh7csZR4mb3O/vZd 6+S8buD/yHVLdymlEtmUkOYv3WEUqpRPATD6kji2Em/Ig2MKfFk77ppvubPqKXUgdfSE g7cPYeWORwFwGAsAXqsPZd8uP0+wj7/ciSexUGY5mQrwFA5Maiq9m1h/0IgFmP4XohC+ eyIQ== X-Received: by 10.69.31.139 with SMTP id km11mr15394957pbd.67.1410374493161; Wed, 10 Sep 2014 11:41:33 -0700 (PDT) Received: from wacom-XPS-8500.wacom.com ([67.51.163.2]) by mx.google.com with ESMTPSA id qp9sm7609312pbc.31.2014.09.10.11.41.31 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 10 Sep 2014 11:41:32 -0700 (PDT) From: Ping Cheng X-Google-Original-From: Ping Cheng To: jkosina@suse.cz Cc: killertofu@gmail.com, linux-input@vger.kernel.org, Ping Cheng Subject: [PATCH 3/4] HID: wacom - remove report_id from wacom_get_report interface Date: Wed, 10 Sep 2014 11:41:26 -0700 Message-Id: <1410374486-25911-1-git-send-email-pingc@wacom.com> X-Mailer: git-send-email 1.9.1 Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Spam-Status: No, score=-9.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP It is assigned in buf[0] anyway. Signed-off-by: Ping Cheng Reviewed-by: Benjamin Tissoires --- drivers/hid/wacom_sys.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/hid/wacom_sys.c b/drivers/hid/wacom_sys.c index 4a7b9c8..f911f97 100644 --- a/drivers/hid/wacom_sys.c +++ b/drivers/hid/wacom_sys.c @@ -26,13 +26,13 @@ #define DEV_ATTR_RW_PERM (S_IRUGO | S_IWUSR | S_IWGRP) #define DEV_ATTR_WO_PERM (S_IWUSR | S_IWGRP) -static int wacom_get_report(struct hid_device *hdev, u8 type, u8 id, - void *buf, size_t size, unsigned int retries) +static int wacom_get_report(struct hid_device *hdev, u8 type, u8 *buf, + size_t size, unsigned int retries) { int retval; do { - retval = hid_hw_raw_request(hdev, id, buf, size, type, + retval = hid_hw_raw_request(hdev, buf[0], buf, size, type, HID_REQ_GET_REPORT); } while ((retval == -ETIMEDOUT || retval == -EPIPE) && --retries); @@ -258,7 +258,7 @@ static int wacom_set_device_mode(struct hid_device *hdev, int report_id, length, 1); if (error >= 0) error = wacom_get_report(hdev, HID_FEATURE_REPORT, - report_id, rep_data, length, 1); + rep_data, length, 1); } while ((error < 0 || rep_data[1] != mode) && limit++ < WAC_MSG_RETRIES); kfree(rep_data);