Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[linux-2.6-microblaze.git] / drivers / base / property.c

diff --git a/drivers/base/property.c b/drivers/base/property.c
index 2e8cd14..ff03f23 100644 (file)
--- a/drivers/base/property.c
+++ b/drivers/base/property.c
@@ -29,9 +29,10 @@
  */
 void device_add_property_set(struct device *dev, struct property_set *pset)
 {
-       if (pset)
-               pset->fwnode.type = FWNODE_PDATA;
+       if (!pset)
+               return;
 
+       pset->fwnode.type = FWNODE_PDATA;
        set_secondary_fwnode(dev, &pset->fwnode);
 }
 EXPORT_SYMBOL_GPL(device_add_property_set);
@@ -155,6 +156,7 @@ EXPORT_SYMBOL_GPL(fwnode_property_present);
  *        %-ENODATA if the property does not have a value,
  *        %-EPROTO if the property is not an array of numbers,
  *        %-EOVERFLOW if the size of the property is not as expected.
+ *        %-ENXIO if no suitable firmware interface is present.
  */
 int device_property_read_u8_array(struct device *dev, const char *propname,
                                  u8 *val, size_t nval)
@@ -179,6 +181,7 @@ EXPORT_SYMBOL_GPL(device_property_read_u8_array);
  *        %-ENODATA if the property does not have a value,
  *        %-EPROTO if the property is not an array of numbers,
  *        %-EOVERFLOW if the size of the property is not as expected.
+ *        %-ENXIO if no suitable firmware interface is present.
  */
 int device_property_read_u16_array(struct device *dev, const char *propname,
                                   u16 *val, size_t nval)
@@ -203,6 +206,7 @@ EXPORT_SYMBOL_GPL(device_property_read_u16_array);
  *        %-ENODATA if the property does not have a value,
  *        %-EPROTO if the property is not an array of numbers,
  *        %-EOVERFLOW if the size of the property is not as expected.
+ *        %-ENXIO if no suitable firmware interface is present.
  */
 int device_property_read_u32_array(struct device *dev, const char *propname,
                                   u32 *val, size_t nval)
@@ -227,6 +231,7 @@ EXPORT_SYMBOL_GPL(device_property_read_u32_array);
  *        %-ENODATA if the property does not have a value,
  *        %-EPROTO if the property is not an array of numbers,
  *        %-EOVERFLOW if the size of the property is not as expected.
+ *        %-ENXIO if no suitable firmware interface is present.
  */
 int device_property_read_u64_array(struct device *dev, const char *propname,
                                   u64 *val, size_t nval)
@@ -251,6 +256,7 @@ EXPORT_SYMBOL_GPL(device_property_read_u64_array);
  *        %-ENODATA if the property does not have a value,
  *        %-EPROTO or %-EILSEQ if the property is not an array of strings,
  *        %-EOVERFLOW if the size of the property is not as expected.
+ *        %-ENXIO if no suitable firmware interface is present.
  */
 int device_property_read_string_array(struct device *dev, const char *propname,
                                      const char **val, size_t nval)
@@ -272,6 +278,7 @@ EXPORT_SYMBOL_GPL(device_property_read_string_array);
  *        %-EINVAL if given arguments are not valid,
  *        %-ENODATA if the property does not have a value,
  *        %-EPROTO or %-EILSEQ if the property type is not a string.
+ *        %-ENXIO if no suitable firmware interface is present.
  */
 int device_property_read_string(struct device *dev, const char *propname,
                                const char **val)
@@ -293,9 +300,11 @@ EXPORT_SYMBOL_GPL(device_property_read_string);
        else if (is_acpi_node(_fwnode_)) \
                _ret_ = acpi_dev_prop_read(to_acpi_node(_fwnode_), _propname_, \
                                           _proptype_, _val_, _nval_); \
-       else \
+       else if (is_pset(_fwnode_)) \
                _ret_ = pset_prop_read_array(to_pset(_fwnode_), _propname_, \
                                             _proptype_, _val_, _nval_); \
+       else \
+               _ret_ = -ENXIO; \
        _ret_; \
 })
 
@@ -433,9 +442,10 @@ int fwnode_property_read_string_array(struct fwnode_handle *fwnode,
        else if (is_acpi_node(fwnode))
                return acpi_dev_prop_read(to_acpi_node(fwnode), propname,
                                          DEV_PROP_STRING, val, nval);
-
-       return pset_prop_read_array(to_pset(fwnode), propname,
-                                   DEV_PROP_STRING, val, nval);
+       else if (is_pset(fwnode))
+               return pset_prop_read_array(to_pset(fwnode), propname,
+                                           DEV_PROP_STRING, val, nval);
+       return -ENXIO;
 }
 EXPORT_SYMBOL_GPL(fwnode_property_read_string_array);
 
@@ -463,7 +473,8 @@ int fwnode_property_read_string(struct fwnode_handle *fwnode,
                return acpi_dev_prop_read(to_acpi_node(fwnode), propname,
                                          DEV_PROP_STRING, val, 1);
 
-       return -ENXIO;
+       return pset_prop_read_array(to_pset(fwnode), propname,
+                                   DEV_PROP_STRING, val, 1);
 }
 EXPORT_SYMBOL_GPL(fwnode_property_read_string);
 
@@ -537,7 +548,7 @@ bool device_dma_is_coherent(struct device *dev)
 EXPORT_SYMBOL_GPL(device_dma_is_coherent);
 
 /**
- * device_get_phy_mode - Get phy mode for given device_node
+ * device_get_phy_mode - Get phy mode for given device
  * @dev:       Pointer to the given device
  *
  * The function gets phy interface string from property 'phy-mode' or
@@ -570,13 +581,18 @@ static void *device_get_mac_addr(struct device *dev,
 {
        int ret = device_property_read_u8_array(dev, name, addr, alen);
 
-       if (ret == 0 && is_valid_ether_addr(addr))
+       if (ret == 0 && alen == ETH_ALEN && is_valid_ether_addr(addr))
                return addr;
        return NULL;
 }
 
 /**
- * Search the device tree for the best MAC address to use.  'mac-address' is
+ * device_get_mac_address - Get the MAC for a given device
+ * @dev:       Pointer to the device
+ * @addr:      Address of buffer to store the MAC in
+ * @alen:      Length of the buffer pointed to by addr, should be ETH_ALEN
+ *
+ * Search the firmware node for the best MAC address to use.  'mac-address' is
  * checked first, because that is supposed to contain to "most recent" MAC
  * address. If that isn't set, then 'local-mac-address' is checked next,
  * because that is the default address.  If that isn't set, then the obsolete
@@ -587,11 +603,11 @@ static void *device_get_mac_addr(struct device *dev,
  * MAC address.
  *
  * All-zero MAC addresses are rejected, because those could be properties that
- * exist in the device tree, but were not set by U-Boot.  For example, the
- * DTS could define 'mac-address' and 'local-mac-address', with zero MAC
- * addresses.  Some older U-Boots only initialized 'local-mac-address'.  In
- * this case, the real MAC is in 'local-mac-address', and 'mac-address' exists
- * but is all zeros.
+ * exist in the firmware tables, but were not updated by the firmware.  For
+ * example, the DTS could define 'mac-address' and 'local-mac-address', with
+ * zero MAC addresses.  Some older U-Boots only initialized 'local-mac-address'.
+ * In this case, the real MAC is in 'local-mac-address', and 'mac-address'
+ * exists but is all zeros.
 */
 void *device_get_mac_address(struct device *dev, char *addr, int alen)
 {