diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-18 13:01:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-05-18 13:01:54 -0400 |
commit | 7cf7d424c309457b21318b05963ff3fd723d5bcd (patch) | |
tree | f24ae5b0bc01978761b285ae546f2076ca705747 | |
parent | c0655fe9b0901a968800f56687be3c62b4cce5d2 (diff) | |
parent | 8947e396a8296c5297928b60043f35dfa56baa05 (diff) |
Merge tag 'for-linus-20150516' of git://git.infradead.org/linux-mtd
Pull MTD fixes from Brian Norris:
"Two MTD fixes for 4.1:
- readtest: the signal-handling code was clobbering the error codes
we should be handling/reporting in this test, rendering it useless.
Noticed by Coverity.
- the common SPI NOR flash DT binding (merged for 4.1-rc1) is being
revised, so let's change that before 4.1 is minted"
* tag 'for-linus-20150516' of git://git.infradead.org/linux-mtd:
Documentation: dt: mtd: replace "nor-jedec" binding with "jedec, spi-nor"
mtd: readtest: don't clobber error reports
-rw-r--r-- | Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt (renamed from Documentation/devicetree/bindings/mtd/m25p80.txt) | 6 | ||||
-rw-r--r-- | drivers/mtd/devices/m25p80.c | 6 | ||||
-rw-r--r-- | drivers/mtd/tests/readtest.c | 6 |
3 files changed, 10 insertions, 8 deletions
diff --git a/Documentation/devicetree/bindings/mtd/m25p80.txt b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt index f20b111b502a..2bee68103b01 100644 --- a/Documentation/devicetree/bindings/mtd/m25p80.txt +++ b/Documentation/devicetree/bindings/mtd/jedec,spi-nor.txt | |||
@@ -8,8 +8,8 @@ Required properties: | |||
8 | is not Linux-only, but in case of Linux, see the "m25p_ids" | 8 | is not Linux-only, but in case of Linux, see the "m25p_ids" |
9 | table in drivers/mtd/devices/m25p80.c for the list of supported | 9 | table in drivers/mtd/devices/m25p80.c for the list of supported |
10 | chips. | 10 | chips. |
11 | Must also include "nor-jedec" for any SPI NOR flash that can be | 11 | Must also include "jedec,spi-nor" for any SPI NOR flash that can |
12 | identified by the JEDEC READ ID opcode (0x9F). | 12 | be identified by the JEDEC READ ID opcode (0x9F). |
13 | - reg : Chip-Select number | 13 | - reg : Chip-Select number |
14 | - spi-max-frequency : Maximum frequency of the SPI bus the chip can operate at | 14 | - spi-max-frequency : Maximum frequency of the SPI bus the chip can operate at |
15 | 15 | ||
@@ -25,7 +25,7 @@ Example: | |||
25 | flash: m25p80@0 { | 25 | flash: m25p80@0 { |
26 | #address-cells = <1>; | 26 | #address-cells = <1>; |
27 | #size-cells = <1>; | 27 | #size-cells = <1>; |
28 | compatible = "spansion,m25p80", "nor-jedec"; | 28 | compatible = "spansion,m25p80", "jedec,spi-nor"; |
29 | reg = <0>; | 29 | reg = <0>; |
30 | spi-max-frequency = <40000000>; | 30 | spi-max-frequency = <40000000>; |
31 | m25p,fast-read; | 31 | m25p,fast-read; |
diff --git a/drivers/mtd/devices/m25p80.c b/drivers/mtd/devices/m25p80.c index 7c8b1694a134..3af137f49ac9 100644 --- a/drivers/mtd/devices/m25p80.c +++ b/drivers/mtd/devices/m25p80.c | |||
@@ -223,7 +223,7 @@ static int m25p_probe(struct spi_device *spi) | |||
223 | */ | 223 | */ |
224 | if (data && data->type) | 224 | if (data && data->type) |
225 | flash_name = data->type; | 225 | flash_name = data->type; |
226 | else if (!strcmp(spi->modalias, "nor-jedec")) | 226 | else if (!strcmp(spi->modalias, "spi-nor")) |
227 | flash_name = NULL; /* auto-detect */ | 227 | flash_name = NULL; /* auto-detect */ |
228 | else | 228 | else |
229 | flash_name = spi->modalias; | 229 | flash_name = spi->modalias; |
@@ -255,7 +255,7 @@ static int m25p_remove(struct spi_device *spi) | |||
255 | * since most of these flash are compatible to some extent, and their | 255 | * since most of these flash are compatible to some extent, and their |
256 | * differences can often be differentiated by the JEDEC read-ID command, we | 256 | * differences can often be differentiated by the JEDEC read-ID command, we |
257 | * encourage new users to add support to the spi-nor library, and simply bind | 257 | * encourage new users to add support to the spi-nor library, and simply bind |
258 | * against a generic string here (e.g., "nor-jedec"). | 258 | * against a generic string here (e.g., "jedec,spi-nor"). |
259 | * | 259 | * |
260 | * Many flash names are kept here in this list (as well as in spi-nor.c) to | 260 | * Many flash names are kept here in this list (as well as in spi-nor.c) to |
261 | * keep them available as module aliases for existing platforms. | 261 | * keep them available as module aliases for existing platforms. |
@@ -305,7 +305,7 @@ static const struct spi_device_id m25p_ids[] = { | |||
305 | * Generic support for SPI NOR that can be identified by the JEDEC READ | 305 | * Generic support for SPI NOR that can be identified by the JEDEC READ |
306 | * ID opcode (0x9F). Use this, if possible. | 306 | * ID opcode (0x9F). Use this, if possible. |
307 | */ | 307 | */ |
308 | {"nor-jedec"}, | 308 | {"spi-nor"}, |
309 | { }, | 309 | { }, |
310 | }; | 310 | }; |
311 | MODULE_DEVICE_TABLE(spi, m25p_ids); | 311 | MODULE_DEVICE_TABLE(spi, m25p_ids); |
diff --git a/drivers/mtd/tests/readtest.c b/drivers/mtd/tests/readtest.c index a3196b750a22..58df07acdbdb 100644 --- a/drivers/mtd/tests/readtest.c +++ b/drivers/mtd/tests/readtest.c | |||
@@ -191,9 +191,11 @@ static int __init mtd_readtest_init(void) | |||
191 | err = ret; | 191 | err = ret; |
192 | } | 192 | } |
193 | 193 | ||
194 | err = mtdtest_relax(); | 194 | ret = mtdtest_relax(); |
195 | if (err) | 195 | if (ret) { |
196 | err = ret; | ||
196 | goto out; | 197 | goto out; |
198 | } | ||
197 | } | 199 | } |
198 | 200 | ||
199 | if (err) | 201 | if (err) |