From patchwork Wed Dec 5 14:02:55 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Benjamin Tissoires X-Patchwork-Id: 1841351 X-Patchwork-Delegate: jikos@jikos.cz Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id B7E8EDF266 for ; Wed, 5 Dec 2012 14:03:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752725Ab2LEODO (ORCPT ); Wed, 5 Dec 2012 09:03:14 -0500 Received: from mail-wg0-f46.google.com ([74.125.82.46]:51151 "EHLO mail-wg0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751669Ab2LEODM (ORCPT ); Wed, 5 Dec 2012 09:03:12 -0500 Received: by mail-wg0-f46.google.com with SMTP id dr13so3049978wgb.1 for ; Wed, 05 Dec 2012 06:03:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references; bh=WGkepmUyYj9Tn+kDNVMS9rgctQHR0zl43JijMlZBfLE=; b=CUUkhmir2FRtkVq9h2zRTN9T7LKLqSn9WZNaUJMaZB/BaWsxNLr/JneGhh2aOv4u/Q FV+noFEe+S5pktVxshNkuiduAtFsnNggkZXm+HLmzGSvrYgqKZxtkc7kdXCWpHwxpEFa Pe3wV1ZS1M8o94LTirX2il+DOmrZeEZoVDqU0lUMnOkPsMNLfFnWkvXOZgzTx2+lFUhL Xcqdb7qopaiYs/f9dTbEtX2ILOESlFS3+//a12/4AgjEps5XmZ2YugBR3PHZora2WDcU SOyZxo4VHfex6DJ6Bvyc32/6pwL5lThWo/IdwPJT8a9ytmh9DU+4HLuo2Era/6U3N9Ke F4aw== Received: by 10.180.74.20 with SMTP id p20mr3442539wiv.0.1354716191215; Wed, 05 Dec 2012 06:03:11 -0800 (PST) Received: from localhost.localdomain.com (lan31-8-82-247-176-67.fbx.proxad.net. [82.247.176.67]) by mx.google.com with ESMTPS id cf6sm6544288wib.3.2012.12.05.06.03.09 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 05 Dec 2012 06:03:10 -0800 (PST) From: Benjamin Tissoires To: Benjamin Tissoires , Jiri Kosina , Jean Delvare , linux-input@vger.kernel.org, linux-i2c@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 3/4] HID: i2c-hid: remove extra .irq field in struct i2c_hid Date: Wed, 5 Dec 2012 15:02:55 +0100 Message-Id: <1354716176-12558-4-git-send-email-benjamin.tissoires@gmail.com> X-Mailer: git-send-email 1.8.0.1 In-Reply-To: <1354716176-12558-1-git-send-email-benjamin.tissoires@gmail.com> References: <1354716176-12558-1-git-send-email-benjamin.tissoires@gmail.com> Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org There is no point in keeping the irq in i2c_hid as it's already there in client. Signed-off-by: Benjamin Tissoires Reviewed-by: Jean Delvare --- drivers/hid/i2c-hid/i2c-hid.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/drivers/hid/i2c-hid/i2c-hid.c b/drivers/hid/i2c-hid/i2c-hid.c index d00f185..c6630d4 100644 --- a/drivers/hid/i2c-hid/i2c-hid.c +++ b/drivers/hid/i2c-hid/i2c-hid.c @@ -135,8 +135,6 @@ struct i2c_hid { unsigned long flags; /* device flags */ - int irq; /* the interrupt line irq */ - wait_queue_head_t wait; /* For waiting the interrupt */ }; @@ -736,8 +734,6 @@ static int __devinit i2c_hid_init_irq(struct i2c_client *client) return ret; } - ihid->irq = client->irq; - return 0; } @@ -851,7 +847,7 @@ static int __devinit i2c_hid_probe(struct i2c_client *client, hid = hid_allocate_device(); if (IS_ERR(hid)) { ret = PTR_ERR(hid); - goto err; + goto err_irq; } ihid->hid = hid; @@ -881,10 +877,10 @@ static int __devinit i2c_hid_probe(struct i2c_client *client, err_mem_free: hid_destroy_device(hid); -err: - if (ihid->irq) - free_irq(ihid->irq, ihid); +err_irq: + free_irq(client->irq, ihid); +err: i2c_hid_free_buffers(ihid); kfree(ihid); return ret; @@ -912,10 +908,9 @@ static int __devexit i2c_hid_remove(struct i2c_client *client) static int i2c_hid_suspend(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); - struct i2c_hid *ihid = i2c_get_clientdata(client); if (device_may_wakeup(&client->dev)) - enable_irq_wake(ihid->irq); + enable_irq_wake(client->irq); /* Save some power */ i2c_hid_set_power(client, I2C_HID_PWR_SLEEP);