From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 6 May 2016 20:07:33 +0000 (+0200)
Subject: Merge back new device properties material for v4.7.
X-Git-Tag: v4.7-rc1~169^2
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=dab2e29402f40431d2199e6faff48174204d2d06;p=linux.git

Merge back new device properties material for v4.7.
---

dab2e29402f40431d2199e6faff48174204d2d06
diff --cc drivers/base/property.c
index 7f692accdc90,210423d00d78..f38c21de29b7
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@@ -19,9 -19,14 +19,14 @@@
  #include <linux/etherdevice.h>
  #include <linux/phy.h>
  
+ struct property_set {
+ 	struct fwnode_handle fwnode;
+ 	struct property_entry *properties;
+ };
+ 
  static inline bool is_pset_node(struct fwnode_handle *fwnode)
  {
 -	return fwnode && fwnode->type == FWNODE_PDATA;
 +	return !IS_ERR_OR_NULL(fwnode) && fwnode->type == FWNODE_PDATA;
  }
  
  static inline struct property_set *to_pset_node(struct fwnode_handle *fwnode)