diff mbox

[05/13] scpi: move of_match table before probe functions

Message ID 1471515066-3626-6-git-send-email-narmstrong@baylibre.com
State Superseded
Headers show

Commit Message

Neil Armstrong Aug. 18, 2016, 10:10 a.m. UTC
Move the of_match table to prapre adding new compatible strings, with
match data in order to be used by the probe function.

Signed-off-by: Neil Armstrong <narmstrong@baylibre.com>
---
 drivers/firmware/arm_scpi.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

Comments

Sudeep Holla Aug. 19, 2016, 4:24 p.m. UTC | #1
On 18/08/16 11:10, Neil Armstrong wrote:
> Move the of_match table to prapre adding new compatible strings, with
> match data in order to be used by the probe function.
>

I understand the need of this change, but can be part of the patch
introducing the need for this.
Neil Armstrong Aug. 23, 2016, 8:20 a.m. UTC | #2
On 08/19/2016 06:24 PM, Sudeep Holla wrote:
> 
> 
> On 18/08/16 11:10, Neil Armstrong wrote:
>> Move the of_match table to prapre adding new compatible strings, with
>> match data in order to be used by the probe function.
>>
> 
> I understand the need of this change, but can be part of the patch
> introducing the need for this.
> 

Yes, but I did not want to pollute the next patch, I'll merge them for v2.

Neil
diff mbox

Patch

diff --git a/drivers/firmware/arm_scpi.c b/drivers/firmware/arm_scpi.c
index bb9965f..b0d911b 100644
--- a/drivers/firmware/arm_scpi.c
+++ b/drivers/firmware/arm_scpi.c
@@ -972,6 +972,13 @@  static int scpi_alloc_xfer_list(struct device *dev, struct scpi_chan *ch)
 	return 0;
 }
 
+static const struct of_device_id scpi_of_match[] = {
+	{.compatible = "arm,scpi"},
+	{},
+};
+
+MODULE_DEVICE_TABLE(of, scpi_of_match);
+
 static int scpi_probe(struct platform_device *pdev)
 {
 	int count, idx, ret;
@@ -1069,13 +1076,6 @@  err:
 	return of_platform_populate(dev->of_node, NULL, NULL, dev);
 }
 
-static const struct of_device_id scpi_of_match[] = {
-	{.compatible = "arm,scpi"},
-	{},
-};
-
-MODULE_DEVICE_TABLE(of, scpi_of_match);
-
 static struct platform_driver scpi_driver = {
 	.driver = {
 		.name = "scpi_protocol",