From patchwork Mon May 21 12:53:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sudeep Holla X-Patchwork-Id: 136457 Delivered-To: patch@linaro.org Received: by 2002:a2e:9706:0:0:0:0:0 with SMTP id r6-v6csp276979lji; Mon, 21 May 2018 05:53:25 -0700 (PDT) X-Google-Smtp-Source: AB8JxZrMdLyhSPGMts5NH8yiNdoEBAHbeEW7ip/8h5sfiO6FU2GxewQrwZf7ONlnZ+fIrc6luN3/ X-Received: by 2002:a17:902:7488:: with SMTP id h8-v6mr20446116pll.124.1526907205541; Mon, 21 May 2018 05:53:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1526907205; cv=none; d=google.com; s=arc-20160816; b=r2IJUwdyCH5wRaQmKMSwSFR54l38jKi8qIVMDMAwLU5oOyLaVKtMMuEFnvh84r47Ny l1oI0KWHq3NrIPL2RHdr7rMWr+LQ0/9KEymgteHBd7BbB9LItHjeo4K7U2VxnAjJsJ6B RNRVwtEksdeaxMOM6IQJPGtq0nSMPOrA9vL+cL+TDki77zJ/Pd0hnW9VjhBz35YCPT+i p+8jlUusBcpFSeFfXbXTRscImxL8UTsxeUW+d9DlpBjpa25oB0NvisF3+M6/BNcgivZJ e1pQ+LrtWPMKy8QUkpnJkZX8PfZ0AwhIHXSDEoXVut+OK0aO7mlVa29vz8pYwL2USnHY KCjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=FLE4uPuKMZqbe3jSMyL0D4MXEJGa4b8y8O6FBwj725I=; b=WAHfOH36HBFmmZQLd0A9Pk/rqHg6NrON88k+/y1cly8888GIlsA3jgWo5hfMCbSGBo bLjloD0x5kDQQhzZ/avE7U/NN7FB08FqitMZM57S3GVDdK4sQsiFEcGT62zOrxn86pqC t5+SJoIVLvrRSwRlTAE09qXnj2jqm2jAgfyTGI0gDlLNlVxsNgPvZ02wD+8vX4VVzKWc I4RNzVpwAH2r6IV2GH6CZQikkFCP3yINA7c8Cv5GjxVPwE47kcmFLk4W6iv8hwQ4IhSI z9xbwtwxeNqs2Jr/No82IWBYjD7AZkDS6c0Lvb05sOTl5MpGXJEmiKbfqkdqW3fvk2E7 j/bQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v7-v6si3059901pgo.135.2018.05.21.05.53.25; Mon, 21 May 2018 05:53:25 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751072AbeEUMxY (ORCPT + 8 others); Mon, 21 May 2018 08:53:24 -0400 Received: from foss.arm.com ([217.140.101.70]:49160 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750970AbeEUMxX (ORCPT ); Mon, 21 May 2018 08:53:23 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 2245380D; Mon, 21 May 2018 05:53:23 -0700 (PDT) Received: from usa.arm.com (e107155-lin.cambridge.arm.com [10.1.210.28]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 7A8AA3F577; Mon, 21 May 2018 05:53:21 -0700 (PDT) From: Sudeep Holla To: linux-kernel@vger.kernel.org, Andy Shevchenko , linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Sudeep Holla , Jeremy Linton , Catalin Marinas , Lorenzo Pieralisi , Greg Kroah-Hartman Subject: [PATCH v2] drivers: base: cacheinfo: use OF property_read_u32 instead of get_property, read_number Date: Mon, 21 May 2018 13:53:09 +0100 Message-Id: <1526907189-10031-1-git-send-email-sudeep.holla@arm.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1526898749-17263-1-git-send-email-sudeep.holla@arm.com> References: <1526898749-17263-1-git-send-email-sudeep.holla@arm.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org of_property_read_u32 searches for a property in a device node and read a 32-bit value from it. Instead of using of_get_property to get the property and then read 32-bit value using of_read_number, we can simplify it by using of_property_read_u32. Cc: Greg Kroah-Hartman Suggested-by: Andy Shevchenko Signed-off-by: Sudeep Holla --- drivers/base/cacheinfo.c | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) Hi Andy, Ignore my comment on compile errors error with Werror=incompatible-pointer-types I was so hung up on _u64 version and didn't realise that we were using 32-bit with of_read_number originally. Regards, Sudeep v1->v2: - Replaced use of of_property_read_u64 with of_property_read_u32 - Also removed the local variables as Andy initially suggested -- 2.7.4 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/base/cacheinfo.c b/drivers/base/cacheinfo.c index 2880e2ab01f5..5d5b5988e88b 100644 --- a/drivers/base/cacheinfo.c +++ b/drivers/base/cacheinfo.c @@ -74,52 +74,48 @@ static inline int get_cacheinfo_idx(enum cache_type type) static void cache_size(struct cacheinfo *this_leaf, struct device_node *np) { const char *propname; - const __be32 *cache_size; int ct_idx; ct_idx = get_cacheinfo_idx(this_leaf->type); propname = cache_type_info[ct_idx].size_prop; - cache_size = of_get_property(np, propname, NULL); - if (cache_size) - this_leaf->size = of_read_number(cache_size, 1); + if (of_property_read_u32(np, propname, &this_leaf->size)) + this_leaf->size = 0; } /* not cache_line_size() because that's a macro in include/linux/cache.h */ static void cache_get_line_size(struct cacheinfo *this_leaf, struct device_node *np) { - const __be32 *line_size; int i, lim, ct_idx; ct_idx = get_cacheinfo_idx(this_leaf->type); lim = ARRAY_SIZE(cache_type_info[ct_idx].line_size_props); for (i = 0; i < lim; i++) { + int ret; + u32 line_size; const char *propname; propname = cache_type_info[ct_idx].line_size_props[i]; - line_size = of_get_property(np, propname, NULL); - if (line_size) + ret = of_property_read_u32(np, propname, &line_size); + if (!ret) { + this_leaf->coherency_line_size = line_size; break; + } } - - if (line_size) - this_leaf->coherency_line_size = of_read_number(line_size, 1); } static void cache_nr_sets(struct cacheinfo *this_leaf, struct device_node *np) { const char *propname; - const __be32 *nr_sets; int ct_idx; ct_idx = get_cacheinfo_idx(this_leaf->type); propname = cache_type_info[ct_idx].nr_sets_prop; - nr_sets = of_get_property(np, propname, NULL); - if (nr_sets) - this_leaf->number_of_sets = of_read_number(nr_sets, 1); + if (of_property_read_u32(np, propname, &this_leaf->number_of_sets)) + this_leaf->number_of_sets = 0; } static void cache_associativity(struct cacheinfo *this_leaf)