Merge tag 'mvebu-drivers-3.14' of git://git.infradead.org/linux-mvebu into next/drivers (5c748225) · Commits · 戴 / test

drivers/bus/mvebu-mbus.c

+2 −8

Original line number	Diff line number	Diff line
		@@ -588,12 +588,6 @@ static const struct mvebu_mbus_soc_data mv78xx0_mbus_data = {
		.show_cpu_target = mvebu_sdram_debug_show_orion,
		};

		/*
		* The driver doesn't yet have a DT binding because the details of
		* this DT binding still need to be sorted out. However, as a
		* preparation, we already use of_device_id to match a SoC description
		* string against the SoC specific details of this driver.
		*/
		static const struct of_device_id of_mvebu_mbus_ids[] = {
		{ .compatible = "marvell,armada370-mbus",
		.data = &armada_370_xp_mbus_data, },
		@@ -734,11 +728,11 @@ int __init mvebu_mbus_init(const char *soc, phys_addr_t mbuswins_phys_base,
		{
		const struct of_device_id *of_id;

		for (of_id = of_mvebu_mbus_ids; of_id->compatible; of_id++)
		for (of_id = of_mvebu_mbus_ids; of_id->compatible[0]; of_id++)
		if (!strcmp(of_id->compatible, soc))
		break;

		if (!of_id->compatible) {
		if (!of_id->compatible[0]) {
		pr_err("could not find a matching SoC family\n");
		return -ENODEV;
		}