struct matrox_device
{
- unsigned long base_addr;
- unsigned long port_index, port_data;
+ void __iomem *base_addr;
+ void __iomem *port_index;
+ void __iomem *port_data;
u8 data_mask;
- unsigned long phys_addr, virt_addr;
+ unsigned long phys_addr;
+ void __iomem *virt_addr;
unsigned long found;
struct w1_bus_master *bus_master;
dev->phys_addr = pci_resource_start(pdev, 1);
- dev->virt_addr =
- (unsigned long) ioremap_nocache(dev->phys_addr, 16384);
+ dev->virt_addr = ioremap_nocache(dev->phys_addr, 16384);
if (!dev->virt_addr) {
dev_err(&pdev->dev, "%s: failed to ioremap(0x%lx, %d).\n",
__func__, dev->phys_addr, 16384);
if (dev->found) {
w1_remove_master_device(dev->bus_master);
- iounmap((void *) dev->virt_addr);
+ iounmap(dev->virt_addr);
}
kfree(dev);
}