github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-26 16:12:59 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

mvebu driver changes for v3.14

Browse Source 
- mvebu-mbus:
     - remove potential forever loop
     - remove deprecated comment
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJSm6frAAoJEP45WPkGe8ZnlOcP/1Kd4778tvP9rKWkOYEsIFIB
 +uC/aDKKhQDLOgh19Hp2/ePIN5XWIZKBN7B7JrPaxJJ8QJpOur8EAFexVmFX767H
 6pV51xQQJToePeQi1/kLUTmj8COBMz2B1HzXQVSwQz4PiQFx7N5w4x4QZ3GD+mh2
 y5vg3a3GkDo6UHxscEjGUxjnj0m9zIPc12eHNSkfdHPuSG5xwpuu47oSZ7BSHVv9
 56p64zkwV4TwwfumyDf8HBOIy3Y8Di+fQUVWkuDEJDBIpMW2teyUjGBZUUXxtDL7
 j1xAf05URgnNjeeBmuuSead5sjVjqeW9xozUoSCBwRpfh5f6wGLfrU0+n/aKL5Mc
 vZ7DEIxww1F21YsDN/aYZA1+oAIjuXsuUVgoG1lqF7PFL8fnBR5M0aQUPj23Hc5T
 LfKEX8CrM3HyE/Ol2/q+Cj1sSHcw/3ewTAO/Nzp0/Aq1eC/eIlhXOKpcBCCFWOzq
 YRzxOJh/P+yu/NrS2hMZUG5BOKxavSCOqI/7Kt81b94hPCOo9/Tg61JoJXPOqh/m
 zt4b/LUVhvgbf5f0oqDTwa6aKVlsEmL4dtYta94Yw9Xsh7xVzUgsdtxrhIw43IPA
 fUVMN3ELESrARl+82wNSXqHY2siC4984TPOToEl1kPPbSzgbvmzq4hoPRHUe1A8X
 ByTMdM/dmh0q33ftExFs
 =tNyU
 -----END PGP SIGNATURE-----

Merge tag 'mvebu-drivers-3.14' of git://git.infradead.org/linux-mvebu into next/drivers

From Jason Cooper:
mvebu driver changes for v3.14

 - mvebu-mbus:
    - remove potential forever loop
    - remove deprecated comment

* tag 'mvebu-drivers-3.14' of git://git.infradead.org/linux-mvebu:
  bus: mvebu-mbus: Remove deprecated comment
  bus: mvebu-mbus: potential forever loop in mvebu_mbus_init()

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2013-12-03 17:09:56 -08:00
commit 5c74822588
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/bus/mvebu-mbus.c
View File

@ -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;
}