shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

drivers: mtd: nand: rockchip: fix a error while make

Browse Source 
make error info: "error: passing argument 1 of 'nand_scan' from
incompatible pointer type [-Werror=incompatible-pointer-types]".

Fixes: 4c9539a319 ("mtd: rawnand: Pass a nand_chip object to nand_scan()")
Change-Id: Ifb513a4f4466d64bfb88a220ba584220abedde8c
Signed-off-by: Yifeng Zhao <yifeng.zhao@rock-chips.com>
This commit is contained in:
Yifeng Zhao
2020-10-21 18:19:26 +08:00
committed by Tao Huang
parent 5095455d72
commit bcb5409b23
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/mtd/nand/raw/rockchip_nand_v6.c
View File

@@ -748,14 +748,14 @@ static int rk_nand_chip_init(struct device *dev, struct rk_nfc *nfc,
mtd->dev.parent = dev;
mtd->name = "rk-nand";
ret = nand_scan(mtd, nsels);
ret = nand_scan(nand, nsels);
if (ret)
return ret;
ret = mtd_device_register(mtd, NULL, 0);
if (ret) {
dev_err(dev, "failed to register mtd device: %d\n", ret);
nand_release(mtd);
nand_release(nand);
return ret;
}
@@ -794,7 +794,7 @@ static void rk_nand_chips_cleanup(struct rk_nfc *nfc)
while (!list_empty(&nfc->chips)) {
chip = list_first_entry(&nfc->chips, struct rk_nand_chip,
node);
nand_release(nand_to_mtd(&chip->nand));
nand_release(&chip->nand);
list_del(&chip->node);
}
}

6
drivers/mtd/nand/raw/rockchip_nand_v9.c
View File

@@ -733,14 +733,14 @@ static int rk_nand_chip_init(struct device *dev, struct rk_nfc *nfc,
mtd->dev.parent = dev;
mtd->name = "rk-nand";
ret = nand_scan(mtd, nsels);
ret = nand_scan(nand, nsels);
if (ret)
return ret;
ret = mtd_device_register(mtd, NULL, 0);
if (ret) {
dev_err(dev, "failed to register mtd device: %d\n", ret);
nand_release(mtd);
nand_release(nand);
return ret;
}
@@ -779,7 +779,7 @@ static void rk_nand_chips_cleanup(struct rk_nfc *nfc)
while (!list_empty(&nfc->chips)) {
chip = list_first_entry(&nfc->chips, struct rk_nand_chip,
node);
nand_release(nand_to_mtd(&chip->nand));
nand_release(&chip->nand);
list_del(&chip->node);
}
}