diff options
author | Laura Abbott <labbott@fedoraproject.org> | 2016-01-05 08:35:12 -0800 |
---|---|---|
committer | Laura Abbott <labbott@fedoraproject.org> | 2016-01-05 08:35:14 -0800 |
commit | 597938b6aabbba29b6d0cac84fe44d2648faff53 (patch) | |
tree | 9856c8e3134a2d452fd0f557d8cad6726fdd14c7 /0006-device-property-improve-readability-of-macros.patch | |
parent | 94beff34d1612edbd141baafed867613860eee79 (diff) | |
download | kernel-597938b6aabbba29b6d0cac84fe44d2648faff53.tar.gz kernel-597938b6aabbba29b6d0cac84fe44d2648faff53.tar.xz kernel-597938b6aabbba29b6d0cac84fe44d2648faff53.zip |
Drop patches for Lenovo Yoga Touchpad (rhbz 1275718)
These patches break the touchpad on Dell Inspiron 7559.
Drop until they make it in.
Diffstat (limited to '0006-device-property-improve-readability-of-macros.patch')
-rw-r--r-- | 0006-device-property-improve-readability-of-macros.patch | 80 |
1 files changed, 0 insertions, 80 deletions
diff --git a/0006-device-property-improve-readability-of-macros.patch b/0006-device-property-improve-readability-of-macros.patch deleted file mode 100644 index 9792798a2..000000000 --- a/0006-device-property-improve-readability-of-macros.patch +++ /dev/null @@ -1,80 +0,0 @@ -From 1d656fb757c17e48a8a01bd576d14918701ba55c Mon Sep 17 00:00:00 2001 -From: Andy Shevchenko <andriy.shevchenko@linux.intel.com> -Date: Mon, 30 Nov 2015 17:11:34 +0200 -Subject: [PATCH 06/16] device property: improve readability of macros - -There is no functional change. - -Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> -Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com> ---- - drivers/base/property.c | 28 ++++++++++++++-------------- - include/linux/property.h | 4 ++-- - 2 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/drivers/base/property.c b/drivers/base/property.c -index ad3cb09..a3538cb 100644 ---- a/drivers/base/property.c -+++ b/drivers/base/property.c -@@ -400,29 +400,29 @@ int device_property_match_string(struct device *dev, const char *propname, - } - EXPORT_SYMBOL_GPL(device_property_match_string); - --#define OF_DEV_PROP_READ_ARRAY(node, propname, type, val, nval) \ -- (val) ? of_property_read_##type##_array((node), (propname), (val), (nval)) \ -+#define OF_DEV_PROP_READ_ARRAY(node, propname, type, val, nval) \ -+ (val) ? of_property_read_##type##_array((node), (propname), (val), (nval)) \ - : of_property_count_elems_of_size((node), (propname), sizeof(type)) - - #define PSET_PROP_READ_ARRAY(node, propname, type, val, nval) \ - (val) ? pset_prop_read_##type##_array((node), (propname), (val), (nval)) \ - : pset_prop_count_elems_of_size((node), (propname), sizeof(type)) - --#define FWNODE_PROP_READ_ARRAY(_fwnode_, _propname_, _type_, _proptype_, _val_, _nval_) \ --({ \ -- int _ret_; \ -- if (is_of_node(_fwnode_)) \ -- _ret_ = OF_DEV_PROP_READ_ARRAY(to_of_node(_fwnode_), _propname_, \ -- _type_, _val_, _nval_); \ -- else if (is_acpi_node(_fwnode_)) \ -- _ret_ = acpi_node_prop_read(_fwnode_, _propname_, _proptype_, \ -- _val_, _nval_); \ -+#define FWNODE_PROP_READ_ARRAY(_fwnode_, _propname_, _type_, _proptype_, _val_, _nval_) \ -+({ \ -+ int _ret_; \ -+ if (is_of_node(_fwnode_)) \ -+ _ret_ = OF_DEV_PROP_READ_ARRAY(to_of_node(_fwnode_), _propname_, \ -+ _type_, _val_, _nval_); \ -+ else if (is_acpi_node(_fwnode_)) \ -+ _ret_ = acpi_node_prop_read(_fwnode_, _propname_, _proptype_, \ -+ _val_, _nval_); \ - else if (is_pset_node(_fwnode_)) \ - _ret_ = PSET_PROP_READ_ARRAY(to_pset_node(_fwnode_), _propname_, \ - _type_, _val_, _nval_); \ -- else \ -- _ret_ = -ENXIO; \ -- _ret_; \ -+ else \ -+ _ret_ = -ENXIO; \ -+ _ret_; \ - }) - - /** -diff --git a/include/linux/property.h b/include/linux/property.h -index e4f29d8..d1cf208 100644 ---- a/include/linux/property.h -+++ b/include/linux/property.h -@@ -73,8 +73,8 @@ int fwnode_property_match_string(struct fwnode_handle *fwnode, - struct fwnode_handle *device_get_next_child_node(struct device *dev, - struct fwnode_handle *child); - --#define device_for_each_child_node(dev, child) \ -- for (child = device_get_next_child_node(dev, NULL); child; \ -+#define device_for_each_child_node(dev, child) \ -+ for (child = device_get_next_child_node(dev, NULL); child; \ - child = device_get_next_child_node(dev, child)) - - void fwnode_handle_put(struct fwnode_handle *fwnode); --- -2.5.0 - |