From patchwork Thu Feb 11 22:25:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 12084255 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=-17.6 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 32299C433E0 for ; Thu, 11 Feb 2021 22:26:48 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E489464E38 for ; Thu, 11 Feb 2021 22:26:47 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E489464E38 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=gWDxQNP7Z3RnZotInI+7KsVXpQYC4TRQ+HDghzmRebo=; b=Pe/HW3sUJV6ie8ngOFBHQPsX0 SY6eEIFToWvy4af/+0jaRH3HdY7Y4kFZHDuD2Lz6QOH9stKc9Y46J7g7FaJKvgMx83ESnIWCgkexX FxufpQVaq1x7V7qX2DrWayFuRMqd5lFp1Y16OapflirinGeO84HOOW2Z7WDJNEyqwgeDIzGN/d7DU 68e9HR7Nt/IQAnydVcwypOTGnycYyBeIsnx2iPZ1G5H5UmzQdFwPgx1c9D3xs21jdOV4SdGSeCHEx 3cscqWc2xPKQH6lX5fj8//V1PBq7NHODcyPKVMVtQRdZBstDhuvGMGjKvfuM+BX1jiN8ybsHktQQ+ iE0bmvJbA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1lAKP7-0004vM-Ac; Thu, 11 Feb 2021 22:25:41 +0000 Received: from mail-ot1-f52.google.com ([209.85.210.52]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1lAKP0-0004uJ-Ny for linux-arm-kernel@lists.infradead.org; Thu, 11 Feb 2021 22:25:35 +0000 Received: by mail-ot1-f52.google.com with SMTP id k10so6720819otl.2 for ; Thu, 11 Feb 2021 14:25:34 -0800 (PST) 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:in-reply-to :references:mime-version:content-transfer-encoding; bh=59hf+6O4K21P81t02yR2JJsizjTVRLh6ZVSrQljA/sc=; b=EPbxxNf4C6bmdUfchfUlaoU0B4OLE6yQPvjKgZZp+ex0hNivRftthochdrGOliOOGP /qwrfBnvxiZzI1eVj8Unei+YkQeSpxTmh1XCY9b9nzAJDe7pWMikoD4d1DzT0DDYC7uZ DlYrZxavXUjXbS78yRFseX9wPvqIIZUlZterJJuev2zwz2GaPAOvR24TuVTo87shavrm W8uz3dQ1Zlf5XQTWJ9q4yFhJhdvk9C1AYBMB6ybwByq+cEQ8IjtnDcZbalB/uOdPDjns XYg0/T4JwMpow9+SbpZRVQ+q2WQNrJXRp1sjb7OBwQ3RI6mq/y71Co3lM2iu6Z9Bh+24 luOQ== X-Gm-Message-State: AOAM531cMU5MTaiELPaAeYf8uhI+tO5OGTSMxY4WsVVvLQVR2yKdzbY3 li4h6qk933RA06RaUT8LxQ== X-Google-Smtp-Source: ABdhPJyoVcKGRF5I+pIki+Oo8A5jCC9o1Ifs/C5d7kBMPZRLIA+fMwLf/LFw7mtzzAZNV7Q3EHU3YQ== X-Received: by 2002:a9d:605a:: with SMTP id v26mr136880otj.275.1613082333675; Thu, 11 Feb 2021 14:25:33 -0800 (PST) Received: from xps15.herring.priv (24-155-109-49.dyn.grandenetworks.net. [24.155.109.49]) by smtp.googlemail.com with ESMTPSA id j25sm978030otn.55.2021.02.11.14.25.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Feb 2021 14:25:32 -0800 (PST) From: Rob Herring To: Michael Ellerman , Greg Kroah-Hartman , "David S. Miller" , Jakub Kicinski , Frank Rowand , devicetree@vger.kernel.org Subject: [PATCH 2/2] driver core: platform: Drop of_device_node_put() wrapper Date: Thu, 11 Feb 2021 16:25:26 -0600 Message-Id: <20210211222526.1318236-3-robh@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210211222526.1318236-1-robh@kernel.org> References: <20210211222526.1318236-1-robh@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210211_172534_846516_55B42B9E X-CRM114-Status: GOOD ( 17.90 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Felipe Balbi , Michal Marek , "Rafael J. Wysocki" , netdev@vger.kernel.org, linux-usb@vger.kernel.org, Nicolas Palix , Patrice Chotard , linux-kernel@vger.kernel.org, Julia Lawall , Gilles Muller , Paul Mackerras , Benjamin Herrenschmidt , linuxppc-dev@lists.ozlabs.org, cocci@systeme.lip6.fr, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org of_device_node_put() is just a wrapper for of_node_put(). The platform driver core is already polluted with of_node pointers and the only 'get' already uses of_node_get() (though typically the get would happen in of_device_alloc()). Cc: Greg Kroah-Hartman Cc: "Rafael J. Wysocki" Cc: Frank Rowand Signed-off-by: Rob Herring --- drivers/base/platform.c | 2 +- include/linux/of_device.h | 7 ------- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/drivers/base/platform.c b/drivers/base/platform.c index 95fd1549f87d..c31bc9e92dd1 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -571,7 +571,7 @@ static void platform_device_release(struct device *dev) struct platform_object *pa = container_of(dev, struct platform_object, pdev.dev); - of_device_node_put(&pa->pdev.dev); + of_node_put(&pa->pdev.dev->of_node); kfree(pa->pdev.dev.platform_data); kfree(pa->pdev.mfd_cell); kfree(pa->pdev.resource); diff --git a/include/linux/of_device.h b/include/linux/of_device.h index d7a407dfeecb..1d7992a02e36 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h @@ -38,11 +38,6 @@ extern int of_device_request_module(struct device *dev); extern void of_device_uevent(struct device *dev, struct kobj_uevent_env *env); extern int of_device_uevent_modalias(struct device *dev, struct kobj_uevent_env *env); -static inline void of_device_node_put(struct device *dev) -{ - of_node_put(dev->of_node); -} - static inline struct device_node *of_cpu_device_node_get(int cpu) { struct device *cpu_dev; @@ -94,8 +89,6 @@ static inline int of_device_uevent_modalias(struct device *dev, return -ENODEV; } -static inline void of_device_node_put(struct device *dev) { } - static inline const struct of_device_id *of_match_device( const struct of_device_id *matches, const struct device *dev) {