mtd: rawnand: denali: Use managed device resources
[ Upstream commit 3a745b51cddafade99aaea1b93aad31e9614e230 ]
All of the resources used by this driver has managed interfaces, so use
them. Otherwise we will get the following splat:
[ 4.472703] denali-nand-pci 0000:00:05.0: timeout while waiting for irq 0x1000
[ 4.474071] denali-nand-pci: probe of 0000:00:05.0 failed with error -5
[ 4.473538] nand: No NAND device found
[ 4.474068] BUG: unable to handle page fault for address: ffffc90005000410
[ 4.475169] #PF: supervisor write access in kernel mode
[ 4.475579] #PF: error_code(0x0002) - not-present page
[ 4.478362] RIP: 0010:iowrite32+0x9/0x50
[ 4.486068] Call Trace:
[ 4.486269] <IRQ>
[ 4.486443] denali_isr+0x15b/0x300 [denali]
[ 4.486788] ? denali_direct_write+0x50/0x50 [denali]
[ 4.487189] __handle_irq_event_percpu+0x161/0x3b0
[ 4.487571] handle_irq_event+0x7d/0x1b0
[ 4.487884] handle_fasteoi_irq+0x2b0/0x770
[ 4.488219] __common_interrupt+0xc8/0x1b0
[ 4.488549] common_interrupt+0x9a/0xc0
Fixes: 93db446a42
("mtd: nand: move raw NAND related code to the raw/ subdir")
Signed-off-by: Zheyu Ma <zheyuma97@gmail.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20220411125808.958276-1-zheyuma97@gmail.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:

committed by
Greg Kroah-Hartman

parent
dd2b1d70ef
commit
3c68daf4a3
@@ -74,22 +74,21 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
denali->reg = ioremap(csr_base, csr_len);
|
denali->reg = devm_ioremap(denali->dev, csr_base, csr_len);
|
||||||
if (!denali->reg) {
|
if (!denali->reg) {
|
||||||
dev_err(&dev->dev, "Spectra: Unable to remap memory region\n");
|
dev_err(&dev->dev, "Spectra: Unable to remap memory region\n");
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
}
|
}
|
||||||
|
|
||||||
denali->host = ioremap(mem_base, mem_len);
|
denali->host = devm_ioremap(denali->dev, mem_base, mem_len);
|
||||||
if (!denali->host) {
|
if (!denali->host) {
|
||||||
dev_err(&dev->dev, "Spectra: ioremap failed!");
|
dev_err(&dev->dev, "Spectra: ioremap failed!");
|
||||||
ret = -ENOMEM;
|
return -ENOMEM;
|
||||||
goto out_unmap_reg;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = denali_init(denali);
|
ret = denali_init(denali);
|
||||||
if (ret)
|
if (ret)
|
||||||
goto out_unmap_host;
|
return ret;
|
||||||
|
|
||||||
nsels = denali->nbanks;
|
nsels = denali->nbanks;
|
||||||
|
|
||||||
@@ -117,10 +116,6 @@ static int denali_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)
|
|||||||
|
|
||||||
out_remove_denali:
|
out_remove_denali:
|
||||||
denali_remove(denali);
|
denali_remove(denali);
|
||||||
out_unmap_host:
|
|
||||||
iounmap(denali->host);
|
|
||||||
out_unmap_reg:
|
|
||||||
iounmap(denali->reg);
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -129,8 +124,6 @@ static void denali_pci_remove(struct pci_dev *dev)
|
|||||||
struct denali_controller *denali = pci_get_drvdata(dev);
|
struct denali_controller *denali = pci_get_drvdata(dev);
|
||||||
|
|
||||||
denali_remove(denali);
|
denali_remove(denali);
|
||||||
iounmap(denali->reg);
|
|
||||||
iounmap(denali->host);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct pci_driver denali_pci_driver = {
|
static struct pci_driver denali_pci_driver = {
|
||||||
|
Reference in New Issue
Block a user