tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
mtd: cfi_fixup: remove unused 'param' parameter
The 'param' parameter has never been used since its introduction, so
simply remove it.
Signed-off-by: Guillaume LECERF <glecerf@gmail.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
authored by
Guillaume LECERF
and committed by
David Woodhouse
cc318222
027d9ac2
+77
-78
+27
-27
drivers/mtd/chips/cfi_cmdset_0001.c
+27
-27
drivers/mtd/chips/cfi_cmdset_0001.c
···
162
162
#endif
163
163
164
164
/* Atmel chips don't use the same PRI format as Intel chips */
165
-
static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)
165
+
static void fixup_convert_atmel_pri(struct mtd_info *mtd)
166
166
{
167
167
struct map_info *map = mtd->priv;
168
168
struct cfi_private *cfi = map->fldrv_priv;
···
202
202
cfi->cfiq->BufWriteTimeoutMax = 0;
203
203
}
204
204
205
-
static void fixup_at49bv640dx_lock(struct mtd_info *mtd, void *param)
205
+
static void fixup_at49bv640dx_lock(struct mtd_info *mtd)
206
206
{
207
207
struct map_info *map = mtd->priv;
208
208
struct cfi_private *cfi = map->fldrv_priv;
···
214
214
215
215
#ifdef CMDSET0001_DISABLE_ERASE_SUSPEND_ON_WRITE
216
216
/* Some Intel Strata Flash prior to FPO revision C has bugs in this area */
217
-
static void fixup_intel_strataflash(struct mtd_info *mtd, void* param)
217
+
static void fixup_intel_strataflash(struct mtd_info *mtd)
218
218
{
219
219
struct map_info *map = mtd->priv;
220
220
struct cfi_private *cfi = map->fldrv_priv;
···
227
227
#endif
228
228
229
229
#ifdef CMDSET0001_DISABLE_WRITE_SUSPEND
230
-
static void fixup_no_write_suspend(struct mtd_info *mtd, void* param)
230
+
static void fixup_no_write_suspend(struct mtd_info *mtd)
231
231
{
232
232
struct map_info *map = mtd->priv;
233
233
struct cfi_private *cfi = map->fldrv_priv;
···
240
240
}
241
241
#endif
242
242
243
-
static void fixup_st_m28w320ct(struct mtd_info *mtd, void* param)
243
+
static void fixup_st_m28w320ct(struct mtd_info *mtd)
244
244
{
245
245
struct map_info *map = mtd->priv;
246
246
struct cfi_private *cfi = map->fldrv_priv;
···
249
249
cfi->cfiq->BufWriteTimeoutMax = 0; /* Not supported */
250
250
}
251
251
252
-
static void fixup_st_m28w320cb(struct mtd_info *mtd, void* param)
252
+
static void fixup_st_m28w320cb(struct mtd_info *mtd)
253
253
{
254
254
struct map_info *map = mtd->priv;
255
255
struct cfi_private *cfi = map->fldrv_priv;
···
259
259
(cfi->cfiq->EraseRegionInfo[1] & 0xffff0000) | 0x3e;
260
260
};
261
261
262
-
static void fixup_use_point(struct mtd_info *mtd, void *param)
262
+
static void fixup_use_point(struct mtd_info *mtd)
263
263
{
264
264
struct map_info *map = mtd->priv;
265
265
if (!mtd->point && map_is_linear(map)) {
···
268
268
}
269
269
}
270
270
271
-
static void fixup_use_write_buffers(struct mtd_info *mtd, void *param)
271
+
static void fixup_use_write_buffers(struct mtd_info *mtd)
272
272
{
273
273
struct map_info *map = mtd->priv;
274
274
struct cfi_private *cfi = map->fldrv_priv;
···
282
282
/*
283
283
* Some chips power-up with all sectors locked by default.
284
284
*/
285
-
static void fixup_unlock_powerup_lock(struct mtd_info *mtd, void *param)
285
+
static void fixup_unlock_powerup_lock(struct mtd_info *mtd)
286
286
{
287
287
struct map_info *map = mtd->priv;
288
288
struct cfi_private *cfi = map->fldrv_priv;
···
295
295
}
296
296
297
297
static struct cfi_fixup cfi_fixup_table[] = {
298
-
{ CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },
299
-
{ CFI_MFR_ATMEL, AT49BV640D, fixup_at49bv640dx_lock, NULL },
300
-
{ CFI_MFR_ATMEL, AT49BV640DT, fixup_at49bv640dx_lock, NULL },
298
+
{ CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri },
299
+
{ CFI_MFR_ATMEL, AT49BV640D, fixup_at49bv640dx_lock },
300
+
{ CFI_MFR_ATMEL, AT49BV640DT, fixup_at49bv640dx_lock },
301
301
#ifdef CMDSET0001_DISABLE_ERASE_SUSPEND_ON_WRITE
302
-
{ CFI_MFR_ANY, CFI_ID_ANY, fixup_intel_strataflash, NULL },
302
+
{ CFI_MFR_ANY, CFI_ID_ANY, fixup_intel_strataflash },
303
303
#endif
304
304
#ifdef CMDSET0001_DISABLE_WRITE_SUSPEND
305
-
{ CFI_MFR_ANY, CFI_ID_ANY, fixup_no_write_suspend, NULL },
305
+
{ CFI_MFR_ANY, CFI_ID_ANY, fixup_no_write_suspend },
306
306
#endif
307
307
#if !FORCE_WORD_WRITE
308
-
{ CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers, NULL },
308
+
{ CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers },
309
309
#endif
310
-
{ CFI_MFR_ST, 0x00ba, /* M28W320CT */ fixup_st_m28w320ct, NULL },
311
-
{ CFI_MFR_ST, 0x00bb, /* M28W320CB */ fixup_st_m28w320cb, NULL },
312
-
{ CFI_MFR_INTEL, CFI_ID_ANY, fixup_unlock_powerup_lock, NULL, },
313
-
{ 0, 0, NULL, NULL }
310
+
{ CFI_MFR_ST, 0x00ba, /* M28W320CT */ fixup_st_m28w320ct },
311
+
{ CFI_MFR_ST, 0x00bb, /* M28W320CB */ fixup_st_m28w320cb },
312
+
{ CFI_MFR_INTEL, CFI_ID_ANY, fixup_unlock_powerup_lock },
313
+
{ 0, 0, NULL }
314
314
};
315
315
316
316
static struct cfi_fixup jedec_fixup_table[] = {
317
-
{ CFI_MFR_INTEL, I82802AB, fixup_use_fwh_lock, NULL, },
318
-
{ CFI_MFR_INTEL, I82802AC, fixup_use_fwh_lock, NULL, },
319
-
{ CFI_MFR_ST, M50LPW080, fixup_use_fwh_lock, NULL, },
320
-
{ CFI_MFR_ST, M50FLW080A, fixup_use_fwh_lock, NULL, },
321
-
{ CFI_MFR_ST, M50FLW080B, fixup_use_fwh_lock, NULL, },
322
-
{ 0, 0, NULL, NULL }
317
+
{ CFI_MFR_INTEL, I82802AB, fixup_use_fwh_lock },
318
+
{ CFI_MFR_INTEL, I82802AC, fixup_use_fwh_lock },
319
+
{ CFI_MFR_ST, M50LPW080, fixup_use_fwh_lock },
320
+
{ CFI_MFR_ST, M50FLW080A, fixup_use_fwh_lock },
321
+
{ CFI_MFR_ST, M50FLW080B, fixup_use_fwh_lock },
322
+
{ 0, 0, NULL }
323
323
};
324
324
static struct cfi_fixup fixup_table[] = {
325
325
/* The CFI vendor ids and the JEDEC vendor IDs appear
···
327
327
* well. This table is to pick all cases where
328
328
* we know that is the case.
329
329
*/
330
-
{ CFI_MFR_ANY, CFI_ID_ANY, fixup_use_point, NULL },
331
-
{ 0, 0, NULL, NULL }
330
+
{ CFI_MFR_ANY, CFI_ID_ANY, fixup_use_point },
331
+
{ 0, 0, NULL }
332
332
};
333
333
334
334
static void cfi_fixup_major_minor(struct cfi_private *cfi,
+47
-47
drivers/mtd/chips/cfi_cmdset_0002.c
+47
-47
drivers/mtd/chips/cfi_cmdset_0002.c
···
134
134
135
135
#ifdef AMD_BOOTLOC_BUG
136
136
/* Wheee. Bring me the head of someone at AMD. */
137
-
static void fixup_amd_bootblock(struct mtd_info *mtd, void* param)
137
+
static void fixup_amd_bootblock(struct mtd_info *mtd)
138
138
{
139
139
struct map_info *map = mtd->priv;
140
140
struct cfi_private *cfi = map->fldrv_priv;
···
186
186
}
187
187
#endif
188
188
189
-
static void fixup_use_write_buffers(struct mtd_info *mtd, void *param)
189
+
static void fixup_use_write_buffers(struct mtd_info *mtd)
190
190
{
191
191
struct map_info *map = mtd->priv;
192
192
struct cfi_private *cfi = map->fldrv_priv;
···
197
197
}
198
198
199
199
/* Atmel chips don't use the same PRI format as AMD chips */
200
-
static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param)
200
+
static void fixup_convert_atmel_pri(struct mtd_info *mtd)
201
201
{
202
202
struct map_info *map = mtd->priv;
203
203
struct cfi_private *cfi = map->fldrv_priv;
···
228
228
cfi->cfiq->BufWriteTimeoutMax = 0;
229
229
}
230
230
231
-
static void fixup_use_secsi(struct mtd_info *mtd, void *param)
231
+
static void fixup_use_secsi(struct mtd_info *mtd)
232
232
{
233
233
/* Setup for chips with a secsi area */
234
234
mtd->read_user_prot_reg = cfi_amdstd_secsi_read;
235
235
mtd->read_fact_prot_reg = cfi_amdstd_secsi_read;
236
236
}
237
237
238
-
static void fixup_use_erase_chip(struct mtd_info *mtd, void *param)
238
+
static void fixup_use_erase_chip(struct mtd_info *mtd)
239
239
{
240
240
struct map_info *map = mtd->priv;
241
241
struct cfi_private *cfi = map->fldrv_priv;
···
250
250
* Some Atmel chips (e.g. the AT49BV6416) power-up with all sectors
251
251
* locked by default.
252
252
*/
253
-
static void fixup_use_atmel_lock(struct mtd_info *mtd, void *param)
253
+
static void fixup_use_atmel_lock(struct mtd_info *mtd)
254
254
{
255
255
mtd->lock = cfi_atmel_lock;
256
256
mtd->unlock = cfi_atmel_unlock;
···
271
271
cfi->cfiq->NumEraseRegions = 1;
272
272
}
273
273
274
-
static void fixup_sst39vf(struct mtd_info *mtd, void *param)
274
+
static void fixup_sst39vf(struct mtd_info *mtd)
275
275
{
276
276
struct map_info *map = mtd->priv;
277
277
struct cfi_private *cfi = map->fldrv_priv;
···
282
282
cfi->addr_unlock2 = 0x2AAA;
283
283
}
284
284
285
-
static void fixup_sst39vf_rev_b(struct mtd_info *mtd, void *param)
285
+
static void fixup_sst39vf_rev_b(struct mtd_info *mtd)
286
286
{
287
287
struct map_info *map = mtd->priv;
288
288
struct cfi_private *cfi = map->fldrv_priv;
···
295
295
cfi->sector_erase_cmd = CMD(0x50);
296
296
}
297
297
298
-
static void fixup_sst38vf640x_sectorsize(struct mtd_info *mtd, void *param)
298
+
static void fixup_sst38vf640x_sectorsize(struct mtd_info *mtd)
299
299
{
300
300
struct map_info *map = mtd->priv;
301
301
struct cfi_private *cfi = map->fldrv_priv;
302
302
303
-
fixup_sst39vf_rev_b(mtd, param);
303
+
fixup_sst39vf_rev_b(mtd);
304
304
305
305
/*
306
306
* CFI reports 1024 sectors (0x03ff+1) of 64KBytes (0x0100*256) where
···
310
310
pr_warning("%s: Bad 38VF640x CFI data; adjusting sector size from 64 to 8KiB\n", mtd->name);
311
311
}
312
312
313
-
static void fixup_s29gl064n_sectors(struct mtd_info *mtd, void *param)
313
+
static void fixup_s29gl064n_sectors(struct mtd_info *mtd)
314
314
{
315
315
struct map_info *map = mtd->priv;
316
316
struct cfi_private *cfi = map->fldrv_priv;
···
321
321
}
322
322
}
323
323
324
-
static void fixup_s29gl032n_sectors(struct mtd_info *mtd, void *param)
324
+
static void fixup_s29gl032n_sectors(struct mtd_info *mtd)
325
325
{
326
326
struct map_info *map = mtd->priv;
327
327
struct cfi_private *cfi = map->fldrv_priv;
···
334
334
335
335
/* Used to fix CFI-Tables of chips without Extended Query Tables */
336
336
static struct cfi_fixup cfi_nopri_fixup_table[] = {
337
-
{ CFI_MFR_SST, 0x234A, fixup_sst39vf, NULL, }, /* SST39VF1602 */
338
-
{ CFI_MFR_SST, 0x234B, fixup_sst39vf, NULL, }, /* SST39VF1601 */
339
-
{ CFI_MFR_SST, 0x235A, fixup_sst39vf, NULL, }, /* SST39VF3202 */
340
-
{ CFI_MFR_SST, 0x235B, fixup_sst39vf, NULL, }, /* SST39VF3201 */
341
-
{ CFI_MFR_SST, 0x235C, fixup_sst39vf_rev_b, NULL, }, /* SST39VF3202B */
342
-
{ CFI_MFR_SST, 0x235D, fixup_sst39vf_rev_b, NULL, }, /* SST39VF3201B */
343
-
{ CFI_MFR_SST, 0x236C, fixup_sst39vf_rev_b, NULL, }, /* SST39VF6402B */
344
-
{ CFI_MFR_SST, 0x236D, fixup_sst39vf_rev_b, NULL, }, /* SST39VF6401B */
345
-
{ 0, 0, NULL, NULL }
337
+
{ CFI_MFR_SST, 0x234a, fixup_sst39vf }, /* SST39VF1602 */
338
+
{ CFI_MFR_SST, 0x234b, fixup_sst39vf }, /* SST39VF1601 */
339
+
{ CFI_MFR_SST, 0x235a, fixup_sst39vf }, /* SST39VF3202 */
340
+
{ CFI_MFR_SST, 0x235b, fixup_sst39vf }, /* SST39VF3201 */
341
+
{ CFI_MFR_SST, 0x235c, fixup_sst39vf_rev_b }, /* SST39VF3202B */
342
+
{ CFI_MFR_SST, 0x235d, fixup_sst39vf_rev_b }, /* SST39VF3201B */
343
+
{ CFI_MFR_SST, 0x236c, fixup_sst39vf_rev_b }, /* SST39VF6402B */
344
+
{ CFI_MFR_SST, 0x236d, fixup_sst39vf_rev_b }, /* SST39VF6401B */
345
+
{ 0, 0, NULL }
346
346
};
347
347
348
348
static struct cfi_fixup cfi_fixup_table[] = {
349
-
{ CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri, NULL },
349
+
{ CFI_MFR_ATMEL, CFI_ID_ANY, fixup_convert_atmel_pri },
350
350
#ifdef AMD_BOOTLOC_BUG
351
-
{ CFI_MFR_AMD, CFI_ID_ANY, fixup_amd_bootblock, NULL },
352
-
{ CFI_MFR_MACRONIX, CFI_ID_ANY, fixup_amd_bootblock, NULL },
351
+
{ CFI_MFR_AMD, CFI_ID_ANY, fixup_amd_bootblock },
352
+
{ CFI_MFR_MACRONIX, CFI_ID_ANY, fixup_amd_bootblock },
353
353
#endif
354
-
{ CFI_MFR_AMD, 0x0050, fixup_use_secsi, NULL, },
355
-
{ CFI_MFR_AMD, 0x0053, fixup_use_secsi, NULL, },
356
-
{ CFI_MFR_AMD, 0x0055, fixup_use_secsi, NULL, },
357
-
{ CFI_MFR_AMD, 0x0056, fixup_use_secsi, NULL, },
358
-
{ CFI_MFR_AMD, 0x005C, fixup_use_secsi, NULL, },
359
-
{ CFI_MFR_AMD, 0x005F, fixup_use_secsi, NULL, },
360
-
{ CFI_MFR_AMD, 0x0c01, fixup_s29gl064n_sectors, NULL, },
361
-
{ CFI_MFR_AMD, 0x1301, fixup_s29gl064n_sectors, NULL, },
362
-
{ CFI_MFR_AMD, 0x1a00, fixup_s29gl032n_sectors, NULL, },
363
-
{ CFI_MFR_AMD, 0x1a01, fixup_s29gl032n_sectors, NULL, },
364
-
{ CFI_MFR_SST, 0x536A, fixup_sst38vf640x_sectorsize, NULL, }, /* SST38VF6402 */
365
-
{ CFI_MFR_SST, 0x536B, fixup_sst38vf640x_sectorsize, NULL, }, /* SST38VF6401 */
366
-
{ CFI_MFR_SST, 0x536C, fixup_sst38vf640x_sectorsize, NULL, }, /* SST38VF6404 */
367
-
{ CFI_MFR_SST, 0x536D, fixup_sst38vf640x_sectorsize, NULL, }, /* SST38VF6403 */
354
+
{ CFI_MFR_AMD, 0x0050, fixup_use_secsi },
355
+
{ CFI_MFR_AMD, 0x0053, fixup_use_secsi },
356
+
{ CFI_MFR_AMD, 0x0055, fixup_use_secsi },
357
+
{ CFI_MFR_AMD, 0x0056, fixup_use_secsi },
358
+
{ CFI_MFR_AMD, 0x005C, fixup_use_secsi },
359
+
{ CFI_MFR_AMD, 0x005F, fixup_use_secsi },
360
+
{ CFI_MFR_AMD, 0x0c01, fixup_s29gl064n_sectors },
361
+
{ CFI_MFR_AMD, 0x1301, fixup_s29gl064n_sectors },
362
+
{ CFI_MFR_AMD, 0x1a00, fixup_s29gl032n_sectors },
363
+
{ CFI_MFR_AMD, 0x1a01, fixup_s29gl032n_sectors },
364
+
{ CFI_MFR_SST, 0x536a, fixup_sst38vf640x_sectorsize }, /* SST38VF6402 */
365
+
{ CFI_MFR_SST, 0x536b, fixup_sst38vf640x_sectorsize }, /* SST38VF6401 */
366
+
{ CFI_MFR_SST, 0x536c, fixup_sst38vf640x_sectorsize }, /* SST38VF6404 */
367
+
{ CFI_MFR_SST, 0x536d, fixup_sst38vf640x_sectorsize }, /* SST38VF6403 */
368
368
#if !FORCE_WORD_WRITE
369
-
{ CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers, NULL, },
369
+
{ CFI_MFR_ANY, CFI_ID_ANY, fixup_use_write_buffers },
370
370
#endif
371
-
{ 0, 0, NULL, NULL }
371
+
{ 0, 0, NULL }
372
372
};
373
373
static struct cfi_fixup jedec_fixup_table[] = {
374
-
{ CFI_MFR_SST, SST49LF004B, fixup_use_fwh_lock, NULL, },
375
-
{ CFI_MFR_SST, SST49LF040B, fixup_use_fwh_lock, NULL, },
376
-
{ CFI_MFR_SST, SST49LF008A, fixup_use_fwh_lock, NULL, },
377
-
{ 0, 0, NULL, NULL }
374
+
{ CFI_MFR_SST, SST49LF004B, fixup_use_fwh_lock },
375
+
{ CFI_MFR_SST, SST49LF040B, fixup_use_fwh_lock },
376
+
{ CFI_MFR_SST, SST49LF008A, fixup_use_fwh_lock },
377
+
{ 0, 0, NULL }
378
378
};
379
379
380
380
static struct cfi_fixup fixup_table[] = {
···
383
383
* well. This table is to pick all cases where
384
384
* we know that is the case.
385
385
*/
386
-
{ CFI_MFR_ANY, CFI_ID_ANY, fixup_use_erase_chip, NULL },
387
-
{ CFI_MFR_ATMEL, AT49BV6416, fixup_use_atmel_lock, NULL },
388
-
{ 0, 0, NULL, NULL }
386
+
{ CFI_MFR_ANY, CFI_ID_ANY, fixup_use_erase_chip },
387
+
{ CFI_MFR_ATMEL, AT49BV6416, fixup_use_atmel_lock },
388
+
{ 0, 0, NULL }
389
389
};
390
390
391
391
+1
-1
drivers/mtd/chips/cfi_util.c
+1
-1
drivers/mtd/chips/cfi_util.c
+1
-1
drivers/mtd/chips/fwh_lock.h
+1
-1
drivers/mtd/chips/fwh_lock.h