From: Sakari Ailus <sakari.ailus@linux.intel.com>
To: linux-acpi@vger.kernel.org, devicetree@vger.kernel.org
Cc: sudeep.holla@arm.com, lorenzo.pieralisi@arm.com,
mika.westerberg@linux.intel.com, rafael@kernel.org,
mark.rutland@arm.com, broonie@kernel.org, robh@kernel.org,
ahs3@redhat.com
Subject: [PATCH v2.1 11/16] of: No need to include linux/property.h, linux/fwnode.h is sufficient
Date: Mon, 20 Feb 2017 12:37:09 +0200 [thread overview]
Message-ID: <1487587029-21068-1-git-send-email-sakari.ailus@linux.intel.com> (raw)
In-Reply-To: <1486052546-19257-12-git-send-email-sakari.ailus@linux.intel.com>
of.h requires a definition of struct fwnode_handle, and for that it
includes linux/property.h. struct fwnode_handle, however, is defined in
linux/fwnode.h. Include linux/fwnode.h directly.
A number of users were however depending on linux/property.h, thus fix
them by including that header directly as well.
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
---
since v2:
Add changes required for device property API usage in tsc200x-core.c and
dwc2/debugfs.c . Tested on linux-next and linux-pm.
drivers/base/core.c | 1 +
drivers/input/keyboard/gpio_keys.c | 1 +
drivers/input/misc/drv260x.c | 1 +
drivers/input/misc/gpio_decoder.c | 1 +
drivers/input/touchscreen/ad7879.c | 1 +
drivers/input/touchscreen/edt-ft5x06.c | 1 +
drivers/input/touchscreen/tsc200x-core.c | 2 +-
drivers/net/ethernet/faraday/ftgmac100.c | 1 +
drivers/net/ethernet/smsc/smc91x.c | 1 +
drivers/phy/phy-tusb1210.c | 1 +
drivers/power/supply/bq24735-charger.c | 1 +
drivers/usb/common/common.c | 1 +
drivers/usb/dwc2/debugfs.c | 3 ++-
drivers/usb/dwc2/params.c | 1 +
drivers/usb/dwc2/pci.c | 3 ++-
drivers/usb/dwc3/host.c | 1 +
include/linux/of.h | 2 +-
sound/soc/codecs/rt5514.c | 1 +
sound/soc/codecs/ts3a227e.c | 1 +
sound/soc/mediatek/mt8173/mt8173-rt5650.c | 1 +
sound/soc/rockchip/rk3399_gru_sound.c | 1 +
21 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/drivers/base/core.c b/drivers/base/core.c
index bd87807..ad5a4f7 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -24,6 +24,7 @@
#include <linux/of.h>
#include <linux/of_device.h>
#include <linux/pm_runtime.h>
+#include <linux/property.h>
#include <linux/slab.h>
#include <linux/string.h>
#include <linux/sysfs.h>
diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
index 582462d..a560fad 100644
--- a/drivers/input/keyboard/gpio_keys.c
+++ b/drivers/input/keyboard/gpio_keys.c
@@ -20,6 +20,7 @@
#include <linux/slab.h>
#include <linux/sysctl.h>
#include <linux/proc_fs.h>
+#include <linux/property.h>
#include <linux/delay.h>
#include <linux/platform_device.h>
#include <linux/input.h>
diff --git a/drivers/input/misc/drv260x.c b/drivers/input/misc/drv260x.c
index 0a2b865..1642219 100644
--- a/drivers/input/misc/drv260x.c
+++ b/drivers/input/misc/drv260x.c
@@ -22,6 +22,7 @@
#include <linux/slab.h>
#include <linux/delay.h>
#include <linux/gpio/consumer.h>
+#include <linux/property.h>
#include <linux/regulator/consumer.h>
#include <dt-bindings/input/ti-drv260x.h>
diff --git a/drivers/input/misc/gpio_decoder.c b/drivers/input/misc/gpio_decoder.c
index ca7e0ba..a498848 100644
--- a/drivers/input/misc/gpio_decoder.c
+++ b/drivers/input/misc/gpio_decoder.c
@@ -22,6 +22,7 @@
#include <linux/module.h>
#include <linux/of.h>
#include <linux/platform_device.h>
+#include <linux/property.h>
struct gpio_decoder {
struct input_polled_dev *poll_dev;
diff --git a/drivers/input/touchscreen/ad7879.c b/drivers/input/touchscreen/ad7879.c
index e16a446..38ad365 100644
--- a/drivers/input/touchscreen/ad7879.c
+++ b/drivers/input/touchscreen/ad7879.c
@@ -34,6 +34,7 @@
#include <linux/input/touchscreen.h>
#include <linux/platform_data/ad7879.h>
#include <linux/module.h>
+#include <linux/property.h>
#include "ad7879.h"
#define AD7879_REG_ZEROS 0
diff --git a/drivers/input/touchscreen/edt-ft5x06.c b/drivers/input/touchscreen/edt-ft5x06.c
index 28466e3..1978f8b 100644
--- a/drivers/input/touchscreen/edt-ft5x06.c
+++ b/drivers/input/touchscreen/edt-ft5x06.c
@@ -39,6 +39,7 @@
#include <linux/input/mt.h>
#include <linux/input/touchscreen.h>
#include <linux/of_device.h>
+#include <linux/property.h>
#define WORK_REGISTER_THRESHOLD 0x00
#define WORK_REGISTER_REPORT_RATE 0x08
diff --git a/drivers/input/touchscreen/tsc200x-core.c b/drivers/input/touchscreen/tsc200x-core.c
index b7059ed..8849f51 100644
--- a/drivers/input/touchscreen/tsc200x-core.c
+++ b/drivers/input/touchscreen/tsc200x-core.c
@@ -25,11 +25,11 @@
#include <linux/input/touchscreen.h>
#include <linux/interrupt.h>
#include <linux/delay.h>
-#include <linux/pm.h>
#include <linux/of.h>
#include <linux/spi/tsc2005.h>
#include <linux/regulator/consumer.h>
#include <linux/regmap.h>
+#include <linux/property.h>
#include <linux/gpio/consumer.h>
#include "tsc200x-core.h"
diff --git a/drivers/net/ethernet/faraday/ftgmac100.c b/drivers/net/ethernet/faraday/ftgmac100.c
index 2625872..69f2693 100644
--- a/drivers/net/ethernet/faraday/ftgmac100.c
+++ b/drivers/net/ethernet/faraday/ftgmac100.c
@@ -30,6 +30,7 @@
#include <linux/netdevice.h>
#include <linux/phy.h>
#include <linux/platform_device.h>
+#include <linux/property.h>
#include <net/ip.h>
#include <net/ncsi.h>
diff --git a/drivers/net/ethernet/smsc/smc91x.c b/drivers/net/ethernet/smsc/smc91x.c
index 65077c7..5352a08 100644
--- a/drivers/net/ethernet/smsc/smc91x.c
+++ b/drivers/net/ethernet/smsc/smc91x.c
@@ -75,6 +75,7 @@ static const char version[] =
#include <linux/ioport.h>
#include <linux/crc32.h>
#include <linux/platform_device.h>
+#include <linux/property.h>
#include <linux/spinlock.h>
#include <linux/ethtool.h>
#include <linux/mii.h>
diff --git a/drivers/phy/phy-tusb1210.c b/drivers/phy/phy-tusb1210.c
index 4f6d5e7..f7dd21aa 100644
--- a/drivers/phy/phy-tusb1210.c
+++ b/drivers/phy/phy-tusb1210.c
@@ -12,6 +12,7 @@
#include <linux/module.h>
#include <linux/ulpi/driver.h>
#include <linux/gpio/consumer.h>
+#include <linux/property.h>
#include "ulpi_phy.h"
diff --git a/drivers/power/supply/bq24735-charger.c b/drivers/power/supply/bq24735-charger.c
index eb7783b..038f806 100644
--- a/drivers/power/supply/bq24735-charger.c
+++ b/drivers/power/supply/bq24735-charger.c
@@ -27,6 +27,7 @@
#include <linux/of.h>
#include <linux/gpio/consumer.h>
#include <linux/power_supply.h>
+#include <linux/property.h>
#include <linux/slab.h>
#include <linux/power/bq24735-charger.h>
diff --git a/drivers/usb/common/common.c b/drivers/usb/common/common.c
index 5ef8da6..534a498 100644
--- a/drivers/usb/common/common.c
+++ b/drivers/usb/common/common.c
@@ -14,6 +14,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/of.h>
+#include <linux/property.h>
#include <linux/usb/ch9.h>
#include <linux/usb/of.h>
#include <linux/usb/otg.h>
diff --git a/drivers/usb/dwc2/debugfs.c b/drivers/usb/dwc2/debugfs.c
index 0a13091..86736e4 100644
--- a/drivers/usb/dwc2/debugfs.c
+++ b/drivers/usb/dwc2/debugfs.c
@@ -14,9 +14,10 @@
* GNU General Public License for more details.
*/
-#include <linux/spinlock.h>
#include <linux/debugfs.h>
+#include <linux/property.h>
#include <linux/seq_file.h>
+#include <linux/spinlock.h>
#include <linux/uaccess.h>
#include "core.h"
diff --git a/drivers/usb/dwc2/params.c b/drivers/usb/dwc2/params.c
index a786256..7e6da29 100644
--- a/drivers/usb/dwc2/params.c
+++ b/drivers/usb/dwc2/params.c
@@ -35,6 +35,7 @@
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/of_device.h>
+#include <linux/property.h>
#include "core.h"
diff --git a/drivers/usb/dwc2/pci.c b/drivers/usb/dwc2/pci.c
index a23329e..abf6140 100644
--- a/drivers/usb/dwc2/pci.c
+++ b/drivers/usb/dwc2/pci.c
@@ -44,8 +44,9 @@
#include <linux/spinlock.h>
#include <linux/interrupt.h>
#include <linux/io.h>
-#include <linux/slab.h>
#include <linux/pci.h>
+#include <linux/property.h>
+#include <linux/slab.h>
#include <linux/usb.h>
#include <linux/usb/hcd.h>
diff --git a/drivers/usb/dwc3/host.c b/drivers/usb/dwc3/host.c
index 487f0ff..562cbde 100644
--- a/drivers/usb/dwc3/host.c
+++ b/drivers/usb/dwc3/host.c
@@ -16,6 +16,7 @@
*/
#include <linux/platform_device.h>
+#include <linux/property.h>
#include "core.h"
diff --git a/include/linux/of.h b/include/linux/of.h
index 55eee5d..16b2054 100644
--- a/include/linux/of.h
+++ b/include/linux/of.h
@@ -23,7 +23,7 @@
#include <linux/spinlock.h>
#include <linux/topology.h>
#include <linux/notifier.h>
-#include <linux/property.h>
+#include <linux/fwnode.h>
#include <linux/list.h>
#include <asm/byteorder.h>
diff --git a/sound/soc/codecs/rt5514.c b/sound/soc/codecs/rt5514.c
index b281a46..0749219 100644
--- a/sound/soc/codecs/rt5514.c
+++ b/sound/soc/codecs/rt5514.c
@@ -15,6 +15,7 @@
#include <linux/init.h>
#include <linux/delay.h>
#include <linux/pm.h>
+#include <linux/property.h>
#include <linux/regmap.h>
#include <linux/i2c.h>
#include <linux/platform_device.h>
diff --git a/sound/soc/codecs/ts3a227e.c b/sound/soc/codecs/ts3a227e.c
index 4356843..e80b28b 100644
--- a/sound/soc/codecs/ts3a227e.c
+++ b/sound/soc/codecs/ts3a227e.c
@@ -14,6 +14,7 @@
#include <linux/input.h>
#include <linux/module.h>
#include <linux/of_gpio.h>
+#include <linux/property.h>
#include <linux/regmap.h>
#include <sound/core.h>
diff --git a/sound/soc/mediatek/mt8173/mt8173-rt5650.c b/sound/soc/mediatek/mt8173/mt8173-rt5650.c
index ba65f41..433ae4f 100644
--- a/sound/soc/mediatek/mt8173/mt8173-rt5650.c
+++ b/sound/soc/mediatek/mt8173/mt8173-rt5650.c
@@ -17,6 +17,7 @@
#include <linux/module.h>
#include <linux/gpio.h>
#include <linux/of_gpio.h>
+#include <linux/property.h>
#include <sound/soc.h>
#include <sound/jack.h>
#include "../../codecs/rt5645.h"
diff --git a/sound/soc/rockchip/rk3399_gru_sound.c b/sound/soc/rockchip/rk3399_gru_sound.c
index 3475c61..9134b46 100644
--- a/sound/soc/rockchip/rk3399_gru_sound.c
+++ b/sound/soc/rockchip/rk3399_gru_sound.c
@@ -22,6 +22,7 @@
#include <linux/gpio.h>
#include <linux/of_gpio.h>
#include <linux/delay.h>
+#include <linux/property.h>
#include <linux/spi/spi.h>
#include <linux/input.h>
#include <sound/core.h>
--
2.7.4
next prev parent reply other threads:[~2017-02-20 10:37 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-02-02 16:22 [PATCH v2 00/16] ACPI graph support Sakari Ailus
2017-02-02 16:22 ` [PATCH v2 01/16] ACPI / property: Add possiblity to retrieve parent firmware node Sakari Ailus
2017-02-02 16:22 ` [PATCH v2 02/16] device property: Add fwnode_get_parent() Sakari Ailus
2017-02-02 16:22 ` [PATCH v2 03/16] ACPI / property: Add fwnode_get_next_child_node() Sakari Ailus
2017-02-02 16:22 ` [PATCH v2 04/16] device property: Add fwnode_get_named_child_node() Sakari Ailus
2017-02-02 16:22 ` [PATCH v2 05/16] ACPI / property: Add support for remote endpoints Sakari Ailus
2017-02-02 16:22 ` [PATCH v2 06/16] device " Sakari Ailus
[not found] ` <1486052546-19257-1-git-send-email-sakari.ailus-VuQAYsv1563Yd54FQh9/CA@public.gmane.org>
2017-02-02 16:22 ` [PATCH v2 07/16] device property: Add fwnode_handle_get() Sakari Ailus
2017-02-02 16:22 ` [PATCH v2 09/16] driver core: Arrange headers alphabetically Sakari Ailus
2017-02-02 16:22 ` [PATCH v2 11/16] of: No need to include linux/property.h, linux/fwnode.h is sufficient Sakari Ailus
2017-02-20 10:37 ` Sakari Ailus [this message]
2017-02-02 16:22 ` [PATCH v2 08/16] of: Add of_fwnode_handle() to convert device nodes to fwnode_handle Sakari Ailus
2017-02-02 16:22 ` [PATCH v2 10/16] irqchip/gic: Add missing forward declaration for struct device Sakari Ailus
2017-02-02 16:22 ` [PATCH v2 12/16] device property: Obtain device's fwnode independently of FW type Sakari Ailus
2017-02-02 16:22 ` [PATCH v2 13/16] device property: Get endpoint index from the ACPI tables Sakari Ailus
2017-02-02 16:22 ` [PATCH v2 14/16] of: Add nop implementation of of_get_next_parent() Sakari Ailus
2017-02-02 16:22 ` [PATCH v2 15/16] device property: Add fwnode_get_next_parent() Sakari Ailus
2017-02-07 18:57 ` Al Stone
[not found] ` <9a481aec-92e6-ac01-b825-167bf73dfb11-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
2017-02-08 11:50 ` Rafael J. Wysocki
[not found] ` <6293579.fEEljmGD4Z-yvgW3jdyMHm1GS7QM15AGw@public.gmane.org>
2017-02-08 12:19 ` Rafael J. Wysocki
[not found] ` <7605668.5ZxNsBFnEG-yvgW3jdyMHm1GS7QM15AGw@public.gmane.org>
2017-02-08 16:49 ` Al Stone
2017-02-14 8:01 ` Sakari Ailus
2017-02-14 17:09 ` Al Stone
2017-02-21 8:17 ` Sakari Ailus
[not found] ` <20170221081749.GC16975-S+BSfZ9RZZmRSg0ZkenSGLdO1Tsj/99ntUK59QYPAWc@public.gmane.org>
2017-02-21 23:00 ` Rafael J. Wysocki
2017-02-22 13:12 ` Sakari Ailus
2017-02-23 17:01 ` Sakari Ailus
2017-02-02 16:22 ` [PATCH v2 16/16] ACPI / DSD: Document references, ports and endpoints Sakari Ailus
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1487587029-21068-1-git-send-email-sakari.ailus@linux.intel.com \
--to=sakari.ailus@linux.intel.com \
--cc=ahs3@redhat.com \
--cc=broonie@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=lorenzo.pieralisi@arm.com \
--cc=mark.rutland@arm.com \
--cc=mika.westerberg@linux.intel.com \
--cc=rafael@kernel.org \
--cc=robh@kernel.org \
--cc=sudeep.holla@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).