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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable 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 B3154C32771 for ; Fri, 24 Jan 2020 11:00:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7DB892077C for ; Fri, 24 Jan 2020 11:00:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579863635; bh=Nn4xNqbd1F1HyJdVecORxYUIPoXruY18BweCdCHykoY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=gWcglom6ahlqjc3nrUjD2GwO2Z9z8487WKQpOrPDM4EcL8Obvg49c0XYiW+RS2ADH ql+3wFdPs6vvkoq+hoIUrQloUTxTxFn2gi/DtuhZMff4Z0zkFzrQ1eM00OQz118o3V rvG6H+6A00RUZpuc+lF5Cn+WUABzrHW5LYpkXquU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729721AbgAXLAe (ORCPT ); Fri, 24 Jan 2020 06:00:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:60152 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1733234AbgAXLAc (ORCPT ); Fri, 24 Jan 2020 06:00:32 -0500 Received: from localhost (ip-213-127-102-57.ip.prioritytelecom.net [213.127.102.57]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1B8732075D; Fri, 24 Jan 2020 11:00:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579863631; bh=Nn4xNqbd1F1HyJdVecORxYUIPoXruY18BweCdCHykoY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=M5gCD0y2e2So1PPAlNgF+uWftZrbn4sV4vGmxsgpUlKTh48lUsdT2+NarmP38n0B1 B5b7bl5YtrzUz23YjXc118UpCoY6cpwDJA0B5R55lsBH1tHtRnUX1TZ7rx6TItIGZu BFLjsVaJWZ/59Un9OAOBG/vFM+t79IsOt6Q2Jwko= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Frank Rowand , Rob Herring , Sasha Levin Subject: [PATCH 4.19 045/639] of: Fix property name in of_node_get_device_type Date: Fri, 24 Jan 2020 10:23:35 +0100 Message-Id: <20200124093053.072444667@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200124093047.008739095@linuxfoundation.org> References: <20200124093047.008739095@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Rob Herring [ Upstream commit 5d5a0ab1a7918fce5ca5c0fb1871a3e2000f85de ] Commit 0413bedabc88 ("of: Add device_type access helper functions") added a new helper not yet used in preparation for some treewide clean up of accesses to 'device_type' properties. Unfortunately, there's an error and 'type' was used for the property name. Fix this. Fixes: 0413bedabc88 ("of: Add device_type access helper functions") Cc: Frank Rowand Signed-off-by: Rob Herring Signed-off-by: Sasha Levin --- include/linux/of.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/linux/of.h b/include/linux/of.h index d5a863c1ee390..dac0201eacef7 100644 --- a/include/linux/of.h +++ b/include/linux/of.h @@ -1001,7 +1001,7 @@ static inline struct device_node *of_find_matching_node( static inline const char *of_node_get_device_type(const struct device_node *np) { - return of_get_property(np, "type", NULL); + return of_get_property(np, "device_type", NULL); } static inline bool of_node_is_type(const struct device_node *np, const char *type) -- 2.20.1