kernel/fd-core: accept SVEC as a carrier

Also, this turns the sdb part to spec-specific code, hopefully as a temporary measure.

kernel/fd-core: accept SVEC as a carrier
Also, this turns the sdb part to spec-specific code, hopefully as a temporary measure.
3c8040b9 · Luis Fernando Ruiz · Alessandro Rubini · 77007f22 · 3c8040b9
Commit 3c8040b9 authored Dec 16, 2012 by Luis Fernando Ruiz Committed by Alessandro Rubini Jan 15, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 18 deletions

fd-core.c kernel/fd-core.c +21 -18

No files found.
--- a/kernel/fd-core.c
+++ b/kernel/fd-core.c
@@ -152,9 +152,10 @@ int fd_probe(struct fmc_device *fmc)
 		return -ENOMEM;
 	}
-	if (strcmp (fmc->carrier_name, "SPEC")) {
+	if (strcmp(fmc->carrier_name, "SPEC") &&
-		dev_err(dev, "driver \"%s\" only works on SPEC card\n",
+	    strcmp(fmc->carrier_name, "SVEC") ) {
-			KBUILD_MODNAME);
+		dev_err(dev, "driver \"%s\" only works on "
+			"SPEC/SVEC cards\n", KBUILD_MODNAME);
 		dev_err(dev, "support for carrier \"%s\" is missing\n",
 			fmc->carrier_name);
 		return -ENODEV;
@@ -180,23 +181,25 @@ int fd_probe(struct fmc_device *fmc)
 		return ret; /* other error: pass over */
 	}
-	/* FIXME: factorize the following stuff */
+	if (!strcmp(fmc->carrier_name, "SPEC")) {
-	/* Verify that we have SDB at offset 0 */
+		/* This is spec-specific by now. FIXME: factorize sdb */
-	if (fmc_readl(fmc, 0) != 0x5344422d) {
-		dev_err(dev, "Can't find SDB magic (got 0x%x)\n",
-			fmc_readl(fmc, 0));
-		ret = -ENODEV;
-		goto out;
-	}
-	dev_info(dev, "Gateware successfully loaded\n");
-	if ( (ret = fmc_scan_sdb_tree(fmc, 0)) < 0) {
+		/* Verify that we have SDB at offset 0 */
-		dev_err(dev, "scan fmc failed %i\n", ret);
+		if (fmc_readl(fmc, 0) != 0x5344422d) {
-		goto out;
+			dev_err(dev, "Can't find SDB magic (got 0x%x)\n",
-	}
+				fmc_readl(fmc, 0));
-	if (fd_show_sdb)
+			ret = -ENODEV;
-		fmc_show_sdb_tree(fmc);
+			goto out;
+		}
+		dev_info(dev, "Gateware successfully loaded\n");
+		if ( (ret = fmc_scan_sdb_tree(fmc, 0)) < 0) {
+			dev_err(dev, "scan fmc failed %i\n", ret);
+			goto out;
+		}
+		if (fd_show_sdb)
+			fmc_show_sdb_tree(fmc);
+	}
 	spin_lock_init(&fd->lock);
 	fmc->mezzanine_data = fd;
 	fd->fmc = fmc;