korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-11-30 23:54:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

mtd: h1910: convert to mtd_device_register()

Browse Source 
Convert to mtd_device_register() and remove the CONFIG_MTD_PARTITIONS
preprocessor conditionals as partitioning is always available.

Signed-off-by: Jamie Iles <jamie@jamieiles.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Jamie Iles 2011-05-23 10:23:24 +01:00 committed by David Woodhouse
parent 99335d0002
commit c4a5522020
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mtd/nand/Kconfig
View File

@ -92,7 +92,7 @@ config MTD_NAND_EDB7312
config MTD_NAND_H1900 config MTD_NAND_H1900
tristate "iPAQ H1900 flash" tristate "iPAQ H1900 flash"
depends on ARCH_PXA && MTD_PARTITIONS depends on ARCH_PXA
help help
This enables the driver for the iPAQ h1900 flash. This enables the driver for the iPAQ h1900 flash.

5
drivers/mtd/nand/h1910.c
View File

@ -38,7 +38,6 @@ static struct mtd_info *h1910_nand_mtd = NULL;
* Module stuff * Module stuff
*/ */
#ifdef CONFIG_MTD_PARTITIONS
/* /*
* Define static partitions for flash device * Define static partitions for flash device
*/ */
@ -50,8 +49,6 @@ static struct mtd_partition partition_info[] = {
#define NUM_PARTITIONS 1 #define NUM_PARTITIONS 1
#endif
/* /*
* hardware specific access to control-lines * hardware specific access to control-lines
* *
@ -154,7 +151,7 @@ static int __init h1910_init(void)
/* Register the partitions */ /* Register the partitions */
printk(KERN_NOTICE "Using %s partition definition\n", part_type); printk(KERN_NOTICE "Using %s partition definition\n", part_type);
add_mtd_partitions(h1910_nand_mtd, mtd_parts, mtd_parts_nb); mtd_device_register(h1910_nand_mtd, mtd_parts, mtd_parts_nb);
/* Return happy */ /* Return happy */
return 0; return 0;