← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to drivers/mtd/maps/dilnetpc.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/mtd/maps/dilnetpc.c
450
450
        partition_info[2].mtdp = &lowlvl_parts[1];
451
451
        partition_info[3].mtdp = &lowlvl_parts[3];
452
452
 
453
 
        add_mtd_partitions(mymtd, partition_info, NUM_PARTITIONS);
 
453
        mtd_device_register(mymtd, partition_info, NUM_PARTITIONS);
454
454
 
455
455
        /*
456
456
        ** now create a virtual MTD device by concatenating the for partitions
463
463
                ** we do not supply mtd pointers in higlvl_partition_info, so
464
464
                ** add_mtd_partitions() will register the devices.
465
465
                */
466
 
                add_mtd_partitions(merged_mtd, higlvl_partition_info, NUM_HIGHLVL_PARTITIONS);
 
466
                mtd_device_register(merged_mtd, higlvl_partition_info,
 
467
                                    NUM_HIGHLVL_PARTITIONS);
467
468
        }
468
469
 
469
470
        return 0;
472
473
static void __exit cleanup_dnpc(void)
473
474
{
474
475
        if(merged_mtd) {
475
 
                del_mtd_partitions(merged_mtd);
 
476
                mtd_device_unregister(merged_mtd);
476
477
                mtd_concat_destroy(merged_mtd);
477
478
        }
478
479
 
479
480
        if (mymtd) {
480
 
                del_mtd_partitions(mymtd);
 
481
                mtd_device_unregister(mymtd);
481
482
                map_destroy(mymtd);
482
483
        }
483
484
        if (dnpc_map.virt) {