Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 41e0cd9d4eeff0895e66cad5c70a90ba41023ea3

Authored by Artem Bityutskiy
1 parent fbd0107f4d
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

UBI: rename _init_scan functions 

We have a couple of initialization funcntionsn left which have "_scan" suffic -
rename them:

ubi_eba_init_scan() -> ubi_eba_init()
ubi_wl_init_scan() -> ubi_wl_init()

Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>

Showing 4 changed files with 9 additions and 9 deletions Side-by-side Diff

drivers/mtd/ubi/build.c
Diff comments   View file @ 41e0cd9
... ... @@ -596,11 +596,11 @@
596 596 if (err)
597 597 goto out_ai;
598 598  
599   - err = ubi_wl_init_scan(ubi, ai);
  599 + err = ubi_wl_init(ubi, ai);
600 600 if (err)
601 601 goto out_vtbl;
602 602  
603   - err = ubi_eba_init_scan(ubi, ai);
  603 + err = ubi_eba_init(ubi, ai);
604 604 if (err)
605 605 goto out_wl;
606 606  
drivers/mtd/ubi/eba.c
Diff comments   View file @ 41e0cd9
... ... @@ -1167,7 +1167,7 @@
1167 1167 * print_rsvd_warning - warn about not having enough reserved PEBs.
1168 1168 * @ubi: UBI device description object
1169 1169 *
1170   - * This is a helper function for 'ubi_eba_init_scan()' which is called when UBI
  1170 + * This is a helper function for 'ubi_eba_init()' which is called when UBI
1171 1171 * cannot reserve enough PEBs for bad block handling. This function makes a
1172 1172 * decision whether we have to print a warning or not. The algorithm is as
1173 1173 * follows:
1174 1174  
... ... @@ -1205,14 +1205,14 @@
1205 1205 }
1206 1206  
1207 1207 /**
1208   - * ubi_eba_init_scan - initialize the EBA sub-system using attaching information.
  1208 + * ubi_eba_init - initialize the EBA sub-system using attaching information.
1209 1209 * @ubi: UBI device description object
1210 1210 * @ai: attaching information
1211 1211 *
1212 1212 * This function returns zero in case of success and a negative error code in
1213 1213 * case of failure.
1214 1214 */
1215   -int ubi_eba_init_scan(struct ubi_device *ubi, struct ubi_attach_info *ai)
  1215 +int ubi_eba_init(struct ubi_device *ubi, struct ubi_attach_info *ai)
1216 1216 {
1217 1217 int i, j, err, num_volumes;
1218 1218 struct ubi_ainf_volume *av;
drivers/mtd/ubi/ubi.h
Diff comments   View file @ 41e0cd9
... ... @@ -529,14 +529,14 @@
529 529 int lnum, const void *buf, int len);
530 530 int ubi_eba_copy_leb(struct ubi_device *ubi, int from, int to,
531 531 struct ubi_vid_hdr *vid_hdr);
532   -int ubi_eba_init_scan(struct ubi_device *ubi, struct ubi_attach_info *ai);
  532 +int ubi_eba_init(struct ubi_device *ubi, struct ubi_attach_info *ai);
533 533  
534 534 /* wl.c */
535 535 int ubi_wl_get_peb(struct ubi_device *ubi);
536 536 int ubi_wl_put_peb(struct ubi_device *ubi, int pnum, int torture);
537 537 int ubi_wl_flush(struct ubi_device *ubi);
538 538 int ubi_wl_scrub_peb(struct ubi_device *ubi, int pnum);
539   -int ubi_wl_init_scan(struct ubi_device *ubi, struct ubi_attach_info *ai);
  539 +int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai);
540 540 void ubi_wl_close(struct ubi_device *ubi);
541 541 int ubi_thread(void *u);
542 542  
drivers/mtd/ubi/wl.c
Diff comments   View file @ 41e0cd9
... ... @@ -1373,14 +1373,14 @@
1373 1373 }
1374 1374  
1375 1375 /**
1376   - * ubi_wl_init_scan - initialize the WL sub-system using attaching information.
  1376 + * ubi_wl_init - initialize the WL sub-system using attaching information.
1377 1377 * @ubi: UBI device description object
1378 1378 * @ai: attaching information
1379 1379 *
1380 1380 * This function returns zero in case of success, and a negative error code in
1381 1381 * case of failure.
1382 1382 */
1383   -int ubi_wl_init_scan(struct ubi_device *ubi, struct ubi_attach_info *ai)
  1383 +int ubi_wl_init(struct ubi_device *ubi, struct ubi_attach_info *ai)
1384 1384 {
1385 1385 int err, i;
1386 1386 struct rb_node *rb1, *rb2;