Title: [8940] trunk: [#5975] revert my m25p80 patch since Anton Vorontsov submit a better patch
- Revision
- 8940
- Author
- bhsong
- Date
- 2010-06-24 06:40:22 -0400 (Thu, 24 Jun 2010)
Log Message
[#5975] revert my m25p80 patch since Anton Vorontsov submit a better patch
no need to use platform flag
Modified Paths
Diff
Modified: trunk/drivers/mtd/devices/m25p80.c (8939 => 8940)
--- trunk/drivers/mtd/devices/m25p80.c 2010-06-24 10:33:26 UTC (rev 8939)
+++ trunk/drivers/mtd/devices/m25p80.c 2010-06-24 10:40:22 UTC (rev 8940)
@@ -795,13 +795,8 @@
jid = jedec_probe(spi);
if (!jid) {
- if (!data->non_jedec) {
- dev_err(&spi->dev, "fail to detect%s\n",
- id->name);
- return -ENODEV;
- } else
- dev_info(&spi->dev, "non-JEDEC variant of %s\n",
- id->name);
+ dev_info(&spi->dev, "non-JEDEC variant of %s\n",
+ id->name);
} else if (jid != id) {
/*
* JEDEC knows better, so overwrite platform ID. We
Modified: trunk/include/linux/spi/flash.h (8939 => 8940)
--- trunk/include/linux/spi/flash.h 2010-06-24 10:33:26 UTC (rev 8939)
+++ trunk/include/linux/spi/flash.h 2010-06-24 10:40:22 UTC (rev 8940)
@@ -25,11 +25,6 @@
char *type;
- /*
- * For non-JEDEC, id will be 0. In this case, we can't be sure
- * whether the flash exists with runtime probing.
- */
- int non_jedec;
/* we'll likely add more ... use JEDEC IDs, etc */
};
_______________________________________________
Linux-kernel-commits mailing list
[email protected]
https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
