From patchwork Thu Aug 7 04:40:57 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 4689231 Return-Path: X-Original-To: patchwork-linux-input@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id C813AC0338 for ; Thu, 7 Aug 2014 04:41:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 09E16201D5 for ; Thu, 7 Aug 2014 04:41:29 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 112DC201CE for ; Thu, 7 Aug 2014 04:41:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757213AbaHGEl1 (ORCPT ); Thu, 7 Aug 2014 00:41:27 -0400 Received: from mail-yk0-f181.google.com ([209.85.160.181]:47418 "EHLO mail-yk0-f181.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756277AbaHGEl1 (ORCPT ); Thu, 7 Aug 2014 00:41:27 -0400 Received: by mail-yk0-f181.google.com with SMTP id q200so2412034ykb.12 for ; Wed, 06 Aug 2014 21:41:26 -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=c+uqlJKdgJkWQSe0oRVLqnU70DF9o0Frduw+w9ESSG8=; b=IDsrd7ZDdjvb4op9LEBkR4IGqbP+qOMuUrKDjj1N2NCSE05ZkTfgFs7plFIFgiSVl1 YiR7ADfezXk4aUr6xcP6jtUQGH/sB1rgSRUF1CPAhgqcqsFwsE/kbwD4LPd3pljgC5K9 fdEnE1Tl/UZQZ7LKHYytudpQrP47bWQZsznwXKFFqI1mHy+v71wpvxv9q/NCVeKbD3PN 1RKrtjBqZNJg1LVjiXKX7g2i67XgfxgB1fhvlhntcFjbZjwXwZqYv/X97in/Cnp2hOSF /ZrgpO2rmJaTeH7MFXSC4Z0jnl3acP1hkieGBl8xzPuCCP1Gj/wTvK3Axnh2SqItlhGa rTIw== X-Received: by 10.236.38.165 with SMTP id a25mr1107947yhb.142.1407386486289; Wed, 06 Aug 2014 21:41:26 -0700 (PDT) Received: from localhost.localdomain ([201.82.52.106]) by mx.google.com with ESMTPSA id e4sm5603312yhe.42.2014.08.06.21.41.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 06 Aug 2014 21:41:25 -0700 (PDT) From: Fabio Estevam To: dmitry.torokhov@gmail.com Cc: linux-input@vger.kernel.org, Fabio Estevam Subject: [PATCH] Input: imx_keypad - use dev_get_drvdata() Date: Thu, 7 Aug 2014 01:40:57 -0300 Message-Id: <1407386457-32587-1-git-send-email-festevam@gmail.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=-7.5 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 From: Fabio Estevam There is no need to first get a platform_device structure in the suspend/resume functions. Make the code simpler by calling dev_get_drvdata() directly. Signed-off-by: Fabio Estevam --- drivers/input/keyboard/imx_keypad.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c index 20a99c3..56f6e99 100644 --- a/drivers/input/keyboard/imx_keypad.c +++ b/drivers/input/keyboard/imx_keypad.c @@ -533,8 +533,7 @@ static int imx_keypad_probe(struct platform_device *pdev) static int __maybe_unused imx_kbd_suspend(struct device *dev) { - struct platform_device *pdev = to_platform_device(dev); - struct imx_keypad *kbd = platform_get_drvdata(pdev); + struct imx_keypad *kbd = dev_get_drvdata(dev); struct input_dev *input_dev = kbd->input_dev; /* imx kbd can wake up system even clock is disabled */ @@ -545,7 +544,7 @@ static int __maybe_unused imx_kbd_suspend(struct device *dev) mutex_unlock(&input_dev->mutex); - if (device_may_wakeup(&pdev->dev)) + if (device_may_wakeup(dev)) enable_irq_wake(kbd->irq); return 0; @@ -553,12 +552,11 @@ static int __maybe_unused imx_kbd_suspend(struct device *dev) static int __maybe_unused imx_kbd_resume(struct device *dev) { - struct platform_device *pdev = to_platform_device(dev); - struct imx_keypad *kbd = platform_get_drvdata(pdev); + struct imx_keypad *kbd = dev_get_drvdata(dev); struct input_dev *input_dev = kbd->input_dev; int ret = 0; - if (device_may_wakeup(&pdev->dev)) + if (device_may_wakeup(dev)) disable_irq_wake(kbd->irq); mutex_lock(&input_dev->mutex);