diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 16:45:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 16:45:22 -0500 |
commit | 7b3480f8b701170c046e1ed362946f5f0d005e13 (patch) | |
tree | bd25e05b4f35699689b485480dddf24f840f80af /drivers/mtd/nand/pxa3xx_nand.c | |
parent | 1c8106528aa6bf16b3f457de80df1cf7462a49a4 (diff) | |
parent | b60ef99c1164a8ad346cf41f9e71acfffb6d25a6 (diff) |
Merge tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6
MTD pull for 3.3
* tag 'for-linus-3.3' of git://git.infradead.org/mtd-2.6: (113 commits)
mtd: Fix dependency for MTD_DOC200x
mtd: do not use mtd->block_markbad directly
logfs: do not use 'mtd->block_isbad' directly
mtd: introduce mtd_can_have_bb helper
mtd: do not use mtd->suspend and mtd->resume directly
mtd: do not use mtd->lock, unlock and is_locked directly
mtd: do not use mtd->sync directly
mtd: harmonize mtd_writev usage
mtd: do not use mtd->lock_user_prot_reg directly
mtd: mtd->write_user_prot_reg directly
mtd: do not use mtd->read_*_prot_reg directly
mtd: do not use mtd->get_*_prot_info directly
mtd: do not use mtd->read_oob directly
mtd: mtdoops: do not use mtd->panic_write directly
romfs: do not use mtd->get_unmapped_area directly
mtd: do not use mtd->get_unmapped_area directly
mtd: do use mtd->point directly
mtd: introduce mtd_has_oob helper
mtd: mtdcore: export symbols cleanup
mtd: clean-up the default_mtd_writev function
...
Fix up trivial edit/remove conflict in drivers/staging/spectra/lld_mtd.c
Diffstat (limited to 'drivers/mtd/nand/pxa3xx_nand.c')
-rw-r--r-- | drivers/mtd/nand/pxa3xx_nand.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index 9eb7f879969..8544d6bf50a 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c | |||
@@ -1258,7 +1258,7 @@ static int pxa3xx_nand_suspend(struct platform_device *pdev, pm_message_t state) | |||
1258 | 1258 | ||
1259 | for (cs = 0; cs < pdata->num_cs; cs++) { | 1259 | for (cs = 0; cs < pdata->num_cs; cs++) { |
1260 | mtd = info->host[cs]->mtd; | 1260 | mtd = info->host[cs]->mtd; |
1261 | mtd->suspend(mtd); | 1261 | mtd_suspend(mtd); |
1262 | } | 1262 | } |
1263 | 1263 | ||
1264 | return 0; | 1264 | return 0; |
@@ -1291,7 +1291,7 @@ static int pxa3xx_nand_resume(struct platform_device *pdev) | |||
1291 | nand_writel(info, NDSR, NDSR_MASK); | 1291 | nand_writel(info, NDSR, NDSR_MASK); |
1292 | for (cs = 0; cs < pdata->num_cs; cs++) { | 1292 | for (cs = 0; cs < pdata->num_cs; cs++) { |
1293 | mtd = info->host[cs]->mtd; | 1293 | mtd = info->host[cs]->mtd; |
1294 | mtd->resume(mtd); | 1294 | mtd_resume(mtd); |
1295 | } | 1295 | } |
1296 | 1296 | ||
1297 | return 0; | 1297 | return 0; |
@@ -1311,17 +1311,7 @@ static struct platform_driver pxa3xx_nand_driver = { | |||
1311 | .resume = pxa3xx_nand_resume, | 1311 | .resume = pxa3xx_nand_resume, |
1312 | }; | 1312 | }; |
1313 | 1313 | ||
1314 | static int __init pxa3xx_nand_init(void) | 1314 | module_platform_driver(pxa3xx_nand_driver); |
1315 | { | ||
1316 | return platform_driver_register(&pxa3xx_nand_driver); | ||
1317 | } | ||
1318 | module_init(pxa3xx_nand_init); | ||
1319 | |||
1320 | static void __exit pxa3xx_nand_exit(void) | ||
1321 | { | ||
1322 | platform_driver_unregister(&pxa3xx_nand_driver); | ||
1323 | } | ||
1324 | module_exit(pxa3xx_nand_exit); | ||
1325 | 1315 | ||
1326 | MODULE_LICENSE("GPL"); | 1316 | MODULE_LICENSE("GPL"); |
1327 | MODULE_DESCRIPTION("PXA3xx NAND controller driver"); | 1317 | MODULE_DESCRIPTION("PXA3xx NAND controller driver"); |