From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.8 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 92C1FC43441 for ; Wed, 21 Nov 2018 14:35:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5810521479 for ; Wed, 21 Nov 2018 14:35:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="BrkKxZfz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5810521479 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731114AbeKVBJ5 (ORCPT ); Wed, 21 Nov 2018 20:09:57 -0500 Received: from mail-pl1-f193.google.com ([209.85.214.193]:34591 "EHLO mail-pl1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729632AbeKVBJ5 (ORCPT ); Wed, 21 Nov 2018 20:09:57 -0500 Received: by mail-pl1-f193.google.com with SMTP id f12-v6so5813543plo.1; Wed, 21 Nov 2018 06:35:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=m8MNf0u08jMZjyhxYBeNt5XJ/cMTLb1yQeYolFPkZ/c=; b=BrkKxZfzz9AdmwdBMKt9IrrYUMenxNTYqHCTzrYqIC8DDXd8KHJMlDFca4aPGhuPtw pXYhbvk86Nw+dwonSjX1B4jQsAh0tY1X0Ad6LYtuDwi7XjAlWwK8Tm0L6f0HVtMQ+jxI nRWkADrVzqadbBQP67NIMLN4Fpct6lZ7KynKPmj54g7MtwMlwAFbC7c9B2BLA5Ee1b1v 4yLFRH1Yv/mOziegg9m4uEIYeFlrs/DxehYWB2f+nJb6h6R6xl1TwmV35/bGgvDZh6pU 4M8V1gaHl/nEVg1Qb2BQtPVGEH3W8LdsxJEKTutel5QNKSqUkxKNCQ6bawH9K80tyTex knPg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=m8MNf0u08jMZjyhxYBeNt5XJ/cMTLb1yQeYolFPkZ/c=; b=kLeFS2YiT5DhEvhwnqrQXbasC64xALHOYNfaqqtSNvD3gh4/nU/k6n+NChrJGtcCRJ btVimEHEVkijdiLNV3mX2qL0p5IOocTE8Ipd+QmquWntGIw4Q4mC1DZfmAaYyWPBWpB8 f40rbohxK4pkWBekhlr8zKRSLEAgbD5VS3rxW1+kO98tExnmcOFGNInSg/q2jfqNBd5f wZTxYluoKQnFqg7z3D0bLeZkhYvln+doUJ7nn3IAUMuJhzlP2mWqT7WKl/nokeo1jPgG m4WDzPROOneX2Dm8/r8BBwtOTsEY4FUrdrxTht4zGpBHtFkxqBLgrIrJbjFGLNyYgP+n XWyg== X-Gm-Message-State: AA+aEWYm1s7op+JwsB/wJKUroduwIp+nCsAF/EHeWdKCbk643ZOdxG6+ OJm4d7us9XjSwnc0RpMMRUA= X-Google-Smtp-Source: AFSGD/Wyq9L8+TkAo2d0ksTAEcBhJ0B3bi6BnQ+tZB/YxsA3I9ooaduyRQtdPeNRWNqv7cKvIe5DKQ== X-Received: by 2002:a63:b4c:: with SMTP id a12mr6293615pgl.131.1542810916640; Wed, 21 Nov 2018 06:35:16 -0800 (PST) Received: from localhost (68.168.130.77.16clouds.com. [68.168.130.77]) by smtp.gmail.com with ESMTPSA id b26sm2905246pfe.91.2018.11.21.06.35.15 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 21 Nov 2018 06:35:15 -0800 (PST) From: Yangtao Li To: dmitry.torokhov@gmail.com Cc: linux-input@vger.kernel.org, linux-kernel@vger.kernel.org, Yangtao Li Subject: [PATCH] Input: i8042 add of_node_put() Date: Wed, 21 Nov 2018 09:35:13 -0500 Message-Id: <20181121143513.22961-1-tiny.windzz@gmail.com> X-Mailer: git-send-email 2.17.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org use of_node_put() to release the refcount. Signed-off-by: Yangtao Li --- drivers/input/serio/i8042-sparcio.h | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h index 796289846204..5495bc035518 100644 --- a/drivers/input/serio/i8042-sparcio.h +++ b/drivers/input/serio/i8042-sparcio.h @@ -108,18 +108,21 @@ static struct platform_driver sparc_i8042_driver = { static int __init i8042_platform_init(void) { + int rc; struct device_node *root = of_find_node_by_path("/"); if (!strcmp(root->name, "SUNW,JavaStation-1")) { /* Hardcoded values for MrCoffee. */ i8042_kbd_irq = i8042_aux_irq = 13 | 0x20; kbd_iobase = ioremap(0x71300060, 8); - if (!kbd_iobase) - return -ENODEV; + if (!kbd_iobase){ + rc = -ENODEV; + goto out; + } } else { - int err = platform_driver_register(&sparc_i8042_driver); - if (err) - return err; + rc = platform_driver_register(&sparc_i8042_driver); + if (rc) + goto out; if (i8042_kbd_irq == -1 || i8042_aux_irq == -1) { @@ -127,13 +130,18 @@ static int __init i8042_platform_init(void) of_iounmap(kbd_res, kbd_iobase, 8); kbd_iobase = (void __iomem *) NULL; } - return -ENODEV; + rc = -ENODEV; + goto out; } } i8042_reset = I8042_RESET_ALWAYS; - return 0; + rc = 0; +out: + of_node_put(root); + + return rc; } static inline void i8042_platform_exit(void) @@ -142,6 +150,8 @@ static inline void i8042_platform_exit(void) if (strcmp(root->name, "SUNW,JavaStation-1")) platform_driver_unregister(&sparc_i8042_driver); + + of_node_put(root); } #else /* !CONFIG_PCI */ -- 2.17.0