From: Ryosuke Saito Date: Mon, 23 Apr 2012 10:47:17 +0000 (+0900) Subject: mtd: block2mtd: page_read() never returns NULL X-Git-Tag: MMI-PSA29.97-13-9~16607^2~56 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=39a5d0b93c244f40ee2e1502e4870685b7dcc1fa;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git mtd: block2mtd: page_read() never returns NULL page_read() never returns NULL, so we can remove the NULL check here. Signed-off-by: Ryosuke Saito Signed-off-by: Artem Bityutskiy Signed-off-by: David Woodhouse --- diff --git a/drivers/mtd/devices/block2mtd.c b/drivers/mtd/devices/block2mtd.c index a4a80b742e65..300aeb837ee3 100644 --- a/drivers/mtd/devices/block2mtd.c +++ b/drivers/mtd/devices/block2mtd.c @@ -52,8 +52,6 @@ static int _block2mtd_erase(struct block2mtd_dev *dev, loff_t to, size_t len) while (pages) { page = page_read(mapping, index); - if (!page) - return -ENOMEM; if (IS_ERR(page)) return PTR_ERR(page); @@ -112,8 +110,6 @@ static int block2mtd_read(struct mtd_info *mtd, loff_t from, size_t len, len = len - cpylen; page = page_read(dev->blkdev->bd_inode->i_mapping, index); - if (!page) - return -ENOMEM; if (IS_ERR(page)) return PTR_ERR(page); @@ -148,8 +144,6 @@ static int _block2mtd_write(struct block2mtd_dev *dev, const u_char *buf, len = len - cpylen; page = page_read(mapping, index); - if (!page) - return -ENOMEM; if (IS_ERR(page)) return PTR_ERR(page);