diff options
-rw-r--r-- | drivers/bus/mvebu-mbus.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/bus/mvebu-mbus.c b/drivers/bus/mvebu-mbus.c index 2394e9753ef5..725c46162bbd 100644 --- a/drivers/bus/mvebu-mbus.c +++ b/drivers/bus/mvebu-mbus.c | |||
@@ -588,12 +588,6 @@ static const struct mvebu_mbus_soc_data mv78xx0_mbus_data = { | |||
588 | .show_cpu_target = mvebu_sdram_debug_show_orion, | 588 | .show_cpu_target = mvebu_sdram_debug_show_orion, |
589 | }; | 589 | }; |
590 | 590 | ||
591 | /* | ||
592 | * The driver doesn't yet have a DT binding because the details of | ||
593 | * this DT binding still need to be sorted out. However, as a | ||
594 | * preparation, we already use of_device_id to match a SoC description | ||
595 | * string against the SoC specific details of this driver. | ||
596 | */ | ||
597 | static const struct of_device_id of_mvebu_mbus_ids[] = { | 591 | static const struct of_device_id of_mvebu_mbus_ids[] = { |
598 | { .compatible = "marvell,armada370-mbus", | 592 | { .compatible = "marvell,armada370-mbus", |
599 | .data = &armada_370_xp_mbus_data, }, | 593 | .data = &armada_370_xp_mbus_data, }, |
@@ -734,11 +728,11 @@ int __init mvebu_mbus_init(const char *soc, phys_addr_t mbuswins_phys_base, | |||
734 | { | 728 | { |
735 | const struct of_device_id *of_id; | 729 | const struct of_device_id *of_id; |
736 | 730 | ||
737 | for (of_id = of_mvebu_mbus_ids; of_id->compatible; of_id++) | 731 | for (of_id = of_mvebu_mbus_ids; of_id->compatible[0]; of_id++) |
738 | if (!strcmp(of_id->compatible, soc)) | 732 | if (!strcmp(of_id->compatible, soc)) |
739 | break; | 733 | break; |
740 | 734 | ||
741 | if (!of_id->compatible) { | 735 | if (!of_id->compatible[0]) { |
742 | pr_err("could not find a matching SoC family\n"); | 736 | pr_err("could not find a matching SoC family\n"); |
743 | return -ENODEV; | 737 | return -ENODEV; |
744 | } | 738 | } |