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
Show 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")) {
-		dev_err(dev, "driver \"%s\" only works on SPEC card\n",
-			KBUILD_MODNAME);
+	if (strcmp(fmc->carrier_name, "SPEC") &&
+	    strcmp(fmc->carrier_name, "SVEC") ) {
+		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,7 +181,9 @@ int fd_probe(struct fmc_device *fmc)
 		return ret; /* other error: pass over */
 	}

-	/* FIXME: factorize the following stuff */
+	if (!strcmp(fmc->carrier_name, "SPEC")) {
+		/* This is spec-specific by now. FIXME: factorize sdb */
+
 		/* Verify that we have SDB at offset 0 */
 		if (fmc_readl(fmc, 0) != 0x5344422d) {
 			dev_err(dev, "Can't find SDB magic (got 0x%x)\n",
@@ -196,7 +199,7 @@ int fd_probe(struct fmc_device *fmc)
 		}
 		if (fd_show_sdb)
 			fmc_show_sdb_tree(fmc);
-
+	}
 	spin_lock_init(&fd->lock);
 	fmc->mezzanine_data = fd;
 	fd->fmc = fmc;