From patchwork Mon Jul 29 14:26:12 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Enrico Weigelt, metux IT consult" X-Patchwork-Id: 11063887 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4B7101398 for ; Mon, 29 Jul 2019 14:26:16 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3C66C286DD for ; Mon, 29 Jul 2019 14:26:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2CBDF2886B; Mon, 29 Jul 2019 14:26:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A3993286DD for ; Mon, 29 Jul 2019 14:26:15 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726190AbfG2O0P (ORCPT ); Mon, 29 Jul 2019 10:26:15 -0400 Received: from mout.kundenserver.de ([212.227.126.135]:40907 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726167AbfG2O0O (ORCPT ); Mon, 29 Jul 2019 10:26:14 -0400 Received: from orion.localdomain ([77.4.29.213]) by mrelayeu.kundenserver.de (mreue010 [212.227.15.167]) with ESMTPSA (Nemesis) id 1MmlCY-1iH1pj0Dd0-00jrbB; Mon, 29 Jul 2019 16:26:13 +0200 From: "Enrico Weigelt, metux IT consult" To: linux-kernel@vger.kernel.org Cc: dmitry.torokhov@gmail.com, linux-input@vger.kernel.org Subject: [PATCH] input: misc: soc_button_array: use platform_device_register_resndata() Date: Mon, 29 Jul 2019 16:26:12 +0200 Message-Id: <1564410372-18506-1-git-send-email-info@metux.net> X-Mailer: git-send-email 1.9.1 X-Provags-ID: V03:K1:fqc44a8/rKnpNASqG6Z6PSHWX575HMzuMroIOGhWv8fytufkDi1 5zIytflr0N4U8Eq4b260l5k+gSvMNqlRk3JhHmb6hyQSyfCl6p/zou2uL1FFQJN+zIYSsgz 3cXd5zEk44Vh9p4gatuKUEwOIUVZB9A0BY55/Pi9UST9EwATtTi0HI1eFFucBr19Kgvo7/6 YDXJMDxHxcWo2s5Oo6Oag== X-UI-Out-Filterresults: notjunk:1;V03:K0:w0TcFa6ZOp0=:dEMl3YhymDb9m78rodQEL1 CBSzQBMLP0kue6Aj1jLMXSrVKt0fOogVXe/E8Rwkx0fsyhYbV1AmivTQK6b179neZmf0gO8ii MAhhXiQneBh9JwJCoXjUIrpA9LboK7IBdIUDaHYLULhF83wwDs8ORm87vBBbjBoAjjLsB5DV9 Q4Dlo4Jrn6kfPrJRaUxiKLiEG5IJfy45gpYEdP9NjuqsW5ZyiUmYJ+TdxO+3JjBGMX4xDFcke cGa7YzWuh8l8iW6F+ZFBGOCbbwusWxOHTWhvxqVWdH4YRQC/Sgd9sEtyNMVnLPt4I7xYI1mAp ldod3ayZohR30g+j/tuzqOeb6djVWhNRMfKA22qAtj8w7YhhbObflR01fAbDMwOPa3XGgwYnz JuS45cCMPdAT7RdfWrToqVSpFnQDqrNG0MhJohXA+X2FJHG4jCyBXLMkQdyaRTgC7TRUFvfIv LWnuvMV085AGvvium27lmMGXJCzuwVcfGHocdjn1XzaHpgzymv7RcZyPaCbc/ZN2uQTmdl0ab iwm/ybqYqCb6QXYTZL4AJbSIDEstUVqhl0zYYxq+9X4eous6lcU4tStPqnwBK00QrW9/NIHoE v8cO48Xepz5JFI1rQfL+EQy5hkivCBqGstESxFtw3rwIeyXrtJLrkMTbO1td1g5n7Kr6jRwox JY+nXEJkgrQuErH9ecsvI/X3XOT+UzFzkI21qHDprCoSFymD08s0NB2roVEyEbGmSsM8oBT6U tSzeVRi2gntP+ct6ugOIdLLHWxwD8J1ZbUAD5g== Sender: linux-input-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-input@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Enrico Weigelt The registration of gpio-keys device can be written much shorter by using the platform_device_register_resndata() helper. Signed-off-by: Enrico Weigelt --- drivers/input/misc/soc_button_array.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/drivers/input/misc/soc_button_array.c b/drivers/input/misc/soc_button_array.c index 5e59f8e5..f5e148b 100644 --- a/drivers/input/misc/soc_button_array.c +++ b/drivers/input/misc/soc_button_array.c @@ -110,25 +110,21 @@ static int soc_button_lookup_gpio(struct device *dev, int acpi_index) gpio_keys_pdata->nbuttons = n_buttons; gpio_keys_pdata->rep = autorepeat; - pd = platform_device_alloc("gpio-keys", PLATFORM_DEVID_AUTO); - if (!pd) { - error = -ENOMEM; + pd = platform_device_register_resndata(NULL, + "gpio-keys", + PLATFORM_DEVID_AUTO, + NULL, + 0, + gpio_keys_pdata, + sizeof(*gpio_keys_pdata)); + + if (IS_ERR(pd)) { + dev_err(&pdev->dev, "failed registering gpio-keys: %ld\n", PTR_ERR(pd)); goto err_free_mem; } - error = platform_device_add_data(pd, gpio_keys_pdata, - sizeof(*gpio_keys_pdata)); - if (error) - goto err_free_pdev; - - error = platform_device_add(pd); - if (error) - goto err_free_pdev; - return pd; -err_free_pdev: - platform_device_put(pd); err_free_mem: devm_kfree(&pdev->dev, gpio_keys_pdata); return ERR_PTR(error);