Skip to content

Commit ed148d3

Browse files
miquelraynalmiquelraynal
committed
mtd: spi-nand: macronix: Fix helper name
Use "macronix_" instead of "mx35lf1ge4ab_" as common prefix for the ->get_status() callback name. This callback is used by many different families, there is no variation in the implementation so far. Signed-off-by: Miquel Raynal <[email protected]> Link: https://lore.kernel.org/linux-mtd/[email protected]
1 parent a06f2e7 commit ed148d3

File tree

1 file changed

+24
-25
lines changed

1 file changed

+24
-25
lines changed

‎drivers/mtd/nand/spi/macronix.c‎

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ static const struct mtd_ooblayout_ops mx35lfxge4ab_ooblayout = {
4949
.free = mx35lfxge4ab_ooblayout_free,
5050
};
5151

52-
static int mx35lf1ge4ab_get_eccsr(struct spinand_device *spinand, u8 *eccsr)
52+
static int macronix_get_eccsr(struct spinand_device *spinand, u8 *eccsr)
5353
{
5454
struct spi_mem_op op = SPI_MEM_OP(SPI_MEM_OP_CMD(0x7c, 1),
5555
SPI_MEM_OP_NO_ADDR,
@@ -64,8 +64,8 @@ static int mx35lf1ge4ab_get_eccsr(struct spinand_device *spinand, u8 *eccsr)
6464
return 0;
6565
}
6666

67-
static int mx35lf1ge4ab_ecc_get_status(struct spinand_device *spinand,
68-
u8 status)
67+
static int macronix_ecc_get_status(struct spinand_device *spinand,
68+
u8 status)
6969
{
7070
struct nand_device *nand = spinand_to_nand(spinand);
7171
u8 eccsr;
@@ -83,7 +83,7 @@ static int mx35lf1ge4ab_ecc_get_status(struct spinand_device *spinand,
8383
* in order to avoid forcing the wear-leveling layer to move
8484
* data around if it's not necessary.
8585
*/
86-
if (mx35lf1ge4ab_get_eccsr(spinand, spinand->scratchbuf))
86+
if (macronix_get_eccsr(spinand, spinand->scratchbuf))
8787
return nanddev_get_ecc_conf(nand)->strength;
8888

8989
eccsr = *spinand->scratchbuf;
@@ -110,7 +110,7 @@ static const struct spinand_info macronix_spinand_table[] = {
110110
&update_cache_variants),
111111
SPINAND_HAS_QE_BIT,
112112
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
113-
mx35lf1ge4ab_ecc_get_status)),
113+
macronix_ecc_get_status)),
114114
SPINAND_INFO("MX35LF2GE4AB",
115115
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x22),
116116
NAND_MEMORG(1, 2048, 64, 64, 2048, 40, 2, 1, 1),
@@ -129,7 +129,7 @@ static const struct spinand_info macronix_spinand_table[] = {
129129
&update_cache_variants),
130130
SPINAND_HAS_QE_BIT,
131131
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
132-
mx35lf1ge4ab_ecc_get_status)),
132+
macronix_ecc_get_status)),
133133
SPINAND_INFO("MX35LF4GE4AD",
134134
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x37, 0x03),
135135
NAND_MEMORG(1, 4096, 128, 64, 2048, 40, 1, 1, 1),
@@ -139,7 +139,7 @@ static const struct spinand_info macronix_spinand_table[] = {
139139
&update_cache_variants),
140140
SPINAND_HAS_QE_BIT,
141141
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
142-
mx35lf1ge4ab_ecc_get_status)),
142+
macronix_ecc_get_status)),
143143
SPINAND_INFO("MX35LF1G24AD",
144144
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x14, 0x03),
145145
NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1),
@@ -194,7 +194,7 @@ static const struct spinand_info macronix_spinand_table[] = {
194194
&update_cache_variants),
195195
SPINAND_HAS_QE_BIT,
196196
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
197-
mx35lf1ge4ab_ecc_get_status)),
197+
macronix_ecc_get_status)),
198198
SPINAND_INFO("MX31UF1GE4BC",
199199
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x9e),
200200
NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1),
@@ -204,7 +204,7 @@ static const struct spinand_info macronix_spinand_table[] = {
204204
&update_cache_variants),
205205
SPINAND_HAS_QE_BIT,
206206
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
207-
mx35lf1ge4ab_ecc_get_status)),
207+
macronix_ecc_get_status)),
208208

209209
SPINAND_INFO("MX35LF2G14AC",
210210
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x20),
@@ -215,7 +215,7 @@ static const struct spinand_info macronix_spinand_table[] = {
215215
&update_cache_variants),
216216
SPINAND_HAS_QE_BIT,
217217
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
218-
mx35lf1ge4ab_ecc_get_status)),
218+
macronix_ecc_get_status)),
219219
SPINAND_INFO("MX35UF4G24AD",
220220
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xb5, 0x03),
221221
NAND_MEMORG(1, 4096, 256, 64, 2048, 40, 2, 1, 1),
@@ -225,7 +225,7 @@ static const struct spinand_info macronix_spinand_table[] = {
225225
&update_cache_variants),
226226
SPINAND_HAS_QE_BIT,
227227
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
228-
mx35lf1ge4ab_ecc_get_status)),
228+
macronix_ecc_get_status)),
229229
SPINAND_INFO("MX35UF4G24AD-Z4I8",
230230
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xf5, 0x03),
231231
NAND_MEMORG(1, 4096, 256, 64, 2048, 40, 1, 1, 1),
@@ -235,7 +235,7 @@ static const struct spinand_info macronix_spinand_table[] = {
235235
&update_cache_variants),
236236
SPINAND_HAS_QE_BIT,
237237
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
238-
mx35lf1ge4ab_ecc_get_status)),
238+
macronix_ecc_get_status)),
239239
SPINAND_INFO("MX35UF4GE4AD",
240240
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xb7, 0x03),
241241
NAND_MEMORG(1, 4096, 256, 64, 2048, 40, 1, 1, 1),
@@ -245,7 +245,7 @@ static const struct spinand_info macronix_spinand_table[] = {
245245
&update_cache_variants),
246246
SPINAND_HAS_QE_BIT,
247247
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
248-
mx35lf1ge4ab_ecc_get_status)),
248+
macronix_ecc_get_status)),
249249
SPINAND_INFO("MX35UF2G14AC",
250250
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xa0),
251251
NAND_MEMORG(1, 2048, 64, 64, 2048, 40, 2, 1, 1),
@@ -255,7 +255,7 @@ static const struct spinand_info macronix_spinand_table[] = {
255255
&update_cache_variants),
256256
SPINAND_HAS_QE_BIT,
257257
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
258-
mx35lf1ge4ab_ecc_get_status)),
258+
macronix_ecc_get_status)),
259259
SPINAND_INFO("MX35UF2G24AD",
260260
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xa4, 0x03),
261261
NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 2, 1, 1),
@@ -265,7 +265,7 @@ static const struct spinand_info macronix_spinand_table[] = {
265265
&update_cache_variants),
266266
SPINAND_HAS_QE_BIT,
267267
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
268-
mx35lf1ge4ab_ecc_get_status)),
268+
macronix_ecc_get_status)),
269269
SPINAND_INFO("MX35UF2G24AD-Z4I8",
270270
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xe4, 0x03),
271271
NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1),
@@ -275,7 +275,7 @@ static const struct spinand_info macronix_spinand_table[] = {
275275
&update_cache_variants),
276276
SPINAND_HAS_QE_BIT,
277277
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
278-
mx35lf1ge4ab_ecc_get_status)),
278+
macronix_ecc_get_status)),
279279
SPINAND_INFO("MX35UF2GE4AD",
280280
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xa6, 0x03),
281281
NAND_MEMORG(1, 2048, 128, 64, 2048, 40, 1, 1, 1),
@@ -285,7 +285,7 @@ static const struct spinand_info macronix_spinand_table[] = {
285285
&update_cache_variants),
286286
SPINAND_HAS_QE_BIT,
287287
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
288-
mx35lf1ge4ab_ecc_get_status)),
288+
macronix_ecc_get_status)),
289289
SPINAND_INFO("MX35UF2GE4AC",
290290
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xa2, 0x01),
291291
NAND_MEMORG(1, 2048, 64, 64, 2048, 40, 1, 1, 1),
@@ -295,7 +295,7 @@ static const struct spinand_info macronix_spinand_table[] = {
295295
&update_cache_variants),
296296
SPINAND_HAS_QE_BIT,
297297
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
298-
mx35lf1ge4ab_ecc_get_status)),
298+
macronix_ecc_get_status)),
299299
SPINAND_INFO("MX35UF1G14AC",
300300
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x90),
301301
NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1),
@@ -305,7 +305,7 @@ static const struct spinand_info macronix_spinand_table[] = {
305305
&update_cache_variants),
306306
SPINAND_HAS_QE_BIT,
307307
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
308-
mx35lf1ge4ab_ecc_get_status)),
308+
macronix_ecc_get_status)),
309309
SPINAND_INFO("MX35UF1G24AD",
310310
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x94, 0x03),
311311
NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1),
@@ -315,7 +315,7 @@ static const struct spinand_info macronix_spinand_table[] = {
315315
&update_cache_variants),
316316
SPINAND_HAS_QE_BIT,
317317
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
318-
mx35lf1ge4ab_ecc_get_status)),
318+
macronix_ecc_get_status)),
319319
SPINAND_INFO("MX35UF1GE4AD",
320320
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x96, 0x03),
321321
NAND_MEMORG(1, 2048, 128, 64, 1024, 20, 1, 1, 1),
@@ -325,7 +325,7 @@ static const struct spinand_info macronix_spinand_table[] = {
325325
&update_cache_variants),
326326
SPINAND_HAS_QE_BIT,
327327
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
328-
mx35lf1ge4ab_ecc_get_status)),
328+
macronix_ecc_get_status)),
329329
SPINAND_INFO("MX35UF1GE4AC",
330330
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x92, 0x01),
331331
NAND_MEMORG(1, 2048, 64, 64, 1024, 20, 1, 1, 1),
@@ -335,8 +335,7 @@ static const struct spinand_info macronix_spinand_table[] = {
335335
&update_cache_variants),
336336
SPINAND_HAS_QE_BIT,
337337
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
338-
mx35lf1ge4ab_ecc_get_status)),
339-
338+
macronix_ecc_get_status)),
340339
SPINAND_INFO("MX31LF2GE4BC",
341340
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0x2e),
342341
NAND_MEMORG(1, 2048, 64, 64, 2048, 40, 1, 1, 1),
@@ -346,7 +345,7 @@ static const struct spinand_info macronix_spinand_table[] = {
346345
&update_cache_variants),
347346
SPINAND_HAS_QE_BIT,
348347
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
349-
mx35lf1ge4ab_ecc_get_status)),
348+
macronix_ecc_get_status)),
350349
SPINAND_INFO("MX3UF2GE4BC",
351350
SPINAND_ID(SPINAND_READID_METHOD_OPCODE_DUMMY, 0xae),
352351
NAND_MEMORG(1, 2048, 64, 64, 2048, 40, 1, 1, 1),
@@ -356,7 +355,7 @@ static const struct spinand_info macronix_spinand_table[] = {
356355
&update_cache_variants),
357356
SPINAND_HAS_QE_BIT,
358357
SPINAND_ECCINFO(&mx35lfxge4ab_ooblayout,
359-
mx35lf1ge4ab_ecc_get_status)),
358+
macronix_ecc_get_status)),
360359
};
361360

362361
static const struct spinand_manufacturer_ops macronix_spinand_manuf_ops = {

0 commit comments

Comments
 (0)