diff options
| author | James Morse <james.morse@arm.com> | 2018-12-21 14:25:19 -0500 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2019-01-03 13:03:54 -0500 |
| commit | acafce48b07bf5f9994a38e7fe237193d43d092e (patch) | |
| tree | 441a12c76bc4301d9ff457d3cd002bab14715dce /drivers/firmware | |
| parent | c3790b3799f8d75d93d26f6fd7bb569fc8c8b0cb (diff) | |
firmware: arm_sdei: Fix DT platform device creation
It turns out the dt-probing part of this wasn't tested properly after it
was merged. commit 3aa0582fdb82 ("of: platform: populate /firmware/ node
from of_platform_default_populate_init()") changed the core-code to
generate the platform devices, meaning the driver's attempt fails, and it
bails out.
Fix this by removing the manual platform-device creation for DT systems,
core code has always done this for us.
CC: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
Signed-off-by: James Morse <james.morse@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'drivers/firmware')
| -rw-r--r-- | drivers/firmware/arm_sdei.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c index dffb47c6b480..c64c7da73829 100644 --- a/drivers/firmware/arm_sdei.c +++ b/drivers/firmware/arm_sdei.c | |||
| @@ -1009,7 +1009,6 @@ static struct platform_driver sdei_driver = { | |||
| 1009 | 1009 | ||
| 1010 | static bool __init sdei_present_dt(void) | 1010 | static bool __init sdei_present_dt(void) |
| 1011 | { | 1011 | { |
| 1012 | struct platform_device *pdev; | ||
| 1013 | struct device_node *np, *fw_np; | 1012 | struct device_node *np, *fw_np; |
| 1014 | 1013 | ||
| 1015 | fw_np = of_find_node_by_name(NULL, "firmware"); | 1014 | fw_np = of_find_node_by_name(NULL, "firmware"); |
| @@ -1019,11 +1018,7 @@ static bool __init sdei_present_dt(void) | |||
| 1019 | np = of_find_matching_node(fw_np, sdei_of_match); | 1018 | np = of_find_matching_node(fw_np, sdei_of_match); |
| 1020 | if (!np) | 1019 | if (!np) |
| 1021 | return false; | 1020 | return false; |
| 1022 | |||
| 1023 | pdev = of_platform_device_create(np, sdei_driver.driver.name, NULL); | ||
| 1024 | of_node_put(np); | 1021 | of_node_put(np); |
| 1025 | if (!pdev) | ||
| 1026 | return false; | ||
| 1027 | 1022 | ||
| 1028 | return true; | 1023 | return true; |
| 1029 | } | 1024 | } |
