From patchwork Fri Jan 29 22:43:11 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corey Minyard X-Patchwork-Id: 60844 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1416118lbb; Fri, 29 Jan 2016 15:44:29 -0800 (PST) X-Received: by 10.98.72.135 with SMTP id q7mr17408508pfi.151.1454111069420; Fri, 29 Jan 2016 15:44:29 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id vx1si5068284pac.159.2016.01.29.15.44.29; Fri, 29 Jan 2016 15:44:29 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932343AbcA2XoJ (ORCPT + 30 others); Fri, 29 Jan 2016 18:44:09 -0500 Received: from vms173017pub.verizon.net ([206.46.173.17]:51991 "EHLO vms173017pub.verizon.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756277AbcA2XoH (ORCPT ); Fri, 29 Jan 2016 18:44:07 -0500 X-Greylist: delayed 3615 seconds by postgrey-1.27 at vger.kernel.org; Fri, 29 Jan 2016 18:44:07 EST Received: from serve.minyard.net ([173.57.176.17]) by vms173017.mailsrvcs.net (Oracle Communications Messaging Server 7.0.5.32.0 64bit (built Jul 16 2014)) with ESMTPA id <0O1Q00KILKGDGNC0@vms173017.mailsrvcs.net> for linux-kernel@vger.kernel.org; Fri, 29 Jan 2016 16:43:31 -0600 (CST) X-CMAE-Score: 0 X-CMAE-Analysis: v=2.1 cv=WpDWSorv c=1 sm=1 tr=0 a=bXmWQgKa9n63w7XTPFb8JQ==:117 a=7aQ_Q-yQQ-AA:10 a=fk1lIlRQAAAA:8 a=VwQbUJbxAAAA:8 a=QOgdVSLnLZlVzGR8tLwA:9 Received: from t430.minyard.net (t430m.minyard.net [192.168.27.3]) by serve.minyard.net (Postfix) with ESMTPA id BDB392F64; Fri, 29 Jan 2016 16:43:24 -0600 (CST) Received: by t430.minyard.net (Postfix, from userid 1000) id 7145730073B; Fri, 29 Jan 2016 16:43:22 -0600 (CST) From: minyard@acm.org To: openipmi-developer@lists.sourceforge.net, linux-kernel@vger.kernel.org Cc: Jean Delvare , Andy Lutomirski , Corey Minyard Subject: [PATCH 1/4] dmi: remove const from return of dmi_find_device Date: Fri, 29 Jan 2016 16:43:11 -0600 Message-id: <1454107394-8914-2-git-send-email-minyard@acm.org> X-Mailer: git-send-email 2.5.0 In-reply-to: <1454107394-8914-1-git-send-email-minyard@acm.org> References: <1454107394-8914-1-git-send-email-minyard@acm.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Corey Minyard A fwnode_handle is being added to dmi_device, and that will need to be updated. So remove the const. Signed-off-by: Corey Minyard Cc: Jean Delvare Cc: Andy Lutomirski --- drivers/firmware/dmi_scan.c | 11 +++++------ include/linux/dmi.h | 10 +++++----- 2 files changed, 10 insertions(+), 11 deletions(-) -- 2.5.0 diff --git a/drivers/firmware/dmi_scan.c b/drivers/firmware/dmi_scan.c index 88bebe1..da471b2 100644 --- a/drivers/firmware/dmi_scan.c +++ b/drivers/firmware/dmi_scan.c @@ -896,14 +896,13 @@ EXPORT_SYMBOL(dmi_name_in_vendors); * A new search is initiated by passing %NULL as the @from argument. * If @from is not %NULL, searches continue from next device. */ -const struct dmi_device *dmi_find_device(int type, const char *name, - const struct dmi_device *from) +struct dmi_device *dmi_find_device(int type, const char *name, + const struct dmi_device *from) { - const struct list_head *head = from ? &from->list : &dmi_devices; - struct list_head *d; + struct list_head *d = from ? from->list.next : dmi_devices.next; - for (d = head->next; d != &dmi_devices; d = d->next) { - const struct dmi_device *dev = + for (; d != &dmi_devices; d = d->next) { + struct dmi_device *dev = list_entry(d, struct dmi_device, list); if (((type == DMI_DEV_TYPE_ANY) || (dev->type == type)) && diff --git a/include/linux/dmi.h b/include/linux/dmi.h index 5e9c74c..a930a4d 100644 --- a/include/linux/dmi.h +++ b/include/linux/dmi.h @@ -98,9 +98,9 @@ struct dmi_dev_onboard { extern struct kobject *dmi_kobj; extern int dmi_check_system(const struct dmi_system_id *list); const struct dmi_system_id *dmi_first_match(const struct dmi_system_id *list); -extern const char * dmi_get_system_info(int field); -extern const struct dmi_device * dmi_find_device(int type, const char *name, - const struct dmi_device *from); +extern const char *dmi_get_system_info(int field); +extern struct dmi_device *dmi_find_device(int type, const char *name, + const struct dmi_device *from); extern void dmi_scan_machine(void); extern void dmi_memdev_walk(void); extern void dmi_set_dump_stack_arch_desc(void); @@ -116,8 +116,8 @@ extern void dmi_memdev_name(u16 handle, const char **bank, const char **device); #else static inline int dmi_check_system(const struct dmi_system_id *list) { return 0; } -static inline const char * dmi_get_system_info(int field) { return NULL; } -static inline const struct dmi_device * dmi_find_device(int type, const char *name, +static inline const char *dmi_get_system_info(int field) { return NULL; } +static inline struct dmi_device *dmi_find_device(int type, const char *name, const struct dmi_device *from) { return NULL; } static inline void dmi_scan_machine(void) { return; } static inline void dmi_memdev_walk(void) { }