Commit 4ab13943 authored by Alan Cox's avatar Alan Cox Committed by David Woodhouse

[MTD] [NOR] intel_dc21285 switch to ROM API

Now that the needed helpers are exported, it becomes a nice simple 
switch over. Closes #9420
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent e416de5e
...@@ -203,16 +203,9 @@ intel_dc21285_init(struct pci_dev *dev, struct map_pci_info *map) ...@@ -203,16 +203,9 @@ intel_dc21285_init(struct pci_dev *dev, struct map_pci_info *map)
* not enabled, should we be allocating a new resource for it * not enabled, should we be allocating a new resource for it
* or simply enabling it? * or simply enabling it?
*/ */
if (!(pci_resource_flags(dev, PCI_ROM_RESOURCE) & pci_enable_rom(dev);
IORESOURCE_ROM_ENABLE)) {
u32 val;
pci_resource_flags(dev, PCI_ROM_RESOURCE) |= IORESOURCE_ROM_ENABLE;
pci_read_config_dword(dev, PCI_ROM_ADDRESS, &val);
val |= PCI_ROM_ADDRESS_ENABLE;
pci_write_config_dword(dev, PCI_ROM_ADDRESS, val);
printk("%s: enabling expansion ROM\n", pci_name(dev)); printk("%s: enabling expansion ROM\n", pci_name(dev));
} }
}
if (!len || !base) if (!len || !base)
return -ENXIO; return -ENXIO;
...@@ -240,10 +233,7 @@ intel_dc21285_exit(struct pci_dev *dev, struct map_pci_info *map) ...@@ -240,10 +233,7 @@ intel_dc21285_exit(struct pci_dev *dev, struct map_pci_info *map)
/* /*
* We need to undo the PCI BAR2/PCI ROM BAR address alteration. * We need to undo the PCI BAR2/PCI ROM BAR address alteration.
*/ */
pci_resource_flags(dev, PCI_ROM_RESOURCE) &= ~IORESOURCE_ROM_ENABLE; pci_disable_rom(dev);
pci_read_config_dword(dev, PCI_ROM_ADDRESS, &val);
val &= ~PCI_ROM_ADDRESS_ENABLE;
pci_write_config_dword(dev, PCI_ROM_ADDRESS, val);
} }
static unsigned long static unsigned long
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment