forked from luck/tmp_suning_uos_patched
tty/nozomi: use pci_iomap instead of ioremap_nocache
Use pci_iomap instead of ioremap_nocache in nozomi_card_init(). This is a cleaner way to do PCI MMIO (performs additional checks) and allows to drop the manual call to pci_resource_start. pci_iomap relies on ioremap for MMIO and thus has uncached behavior. Signed-off-by: Hugo Lefeuvre <hle@owl.eu.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
1355cba9c3
commit
c392ed4642
|
@ -1317,7 +1317,6 @@ static void remove_sysfs_files(struct nozomi *dc)
|
|||
static int nozomi_card_init(struct pci_dev *pdev,
|
||||
const struct pci_device_id *ent)
|
||||
{
|
||||
resource_size_t start;
|
||||
int ret;
|
||||
struct nozomi *dc = NULL;
|
||||
int ndev_idx;
|
||||
|
@ -1357,17 +1356,10 @@ static int nozomi_card_init(struct pci_dev *pdev,
|
|||
goto err_disable_device;
|
||||
}
|
||||
|
||||
start = pci_resource_start(dc->pdev, 0);
|
||||
if (start == 0) {
|
||||
dev_err(&pdev->dev, "No I/O address for card detected\n");
|
||||
ret = -ENODEV;
|
||||
goto err_rel_regs;
|
||||
}
|
||||
|
||||
/* Find out what card type it is */
|
||||
nozomi_get_card_type(dc);
|
||||
|
||||
dc->base_addr = ioremap_nocache(start, dc->card_type);
|
||||
dc->base_addr = pci_iomap(dc->pdev, 0, dc->card_type);
|
||||
if (!dc->base_addr) {
|
||||
dev_err(&pdev->dev, "Unable to map card MMIO\n");
|
||||
ret = -ENODEV;
|
||||
|
|
Loading…
Reference in New Issue
Block a user