Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5160d3f7 authored by Paul Mundt's avatar Paul Mundt
Browse files

sh: pci: Consolidate bus<->resource mapping in pci-lib. 



Now that the io and mem offsets are tracked accordingly, the pci-new
version of the bus<->resource mappers can be used generically. This
moves them in to pci-lib.

Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 09cfeb13

arch/sh/drivers/pci/pci-lib.c

+31 −0
Original line number Diff line number Diff line
@@ -39,6 +39,37 @@ void pcibios_align_resource(void *data, struct resource *res, 
	res->start = start;

}



void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,

			 struct resource *res)

{

	struct pci_channel *hose = dev->sysdata;

	unsigned long offset = 0;



	if (res->flags & IORESOURCE_IO)

		offset = hose->io_offset;

	else if (res->flags & IORESOURCE_MEM)

		offset = hose->mem_offset;



	region->start = res->start - offset;

	region->end = res->end - offset;

}



void __devinit

pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,

			struct pci_bus_region *region)

{

	struct pci_channel *hose = dev->sysdata;

	unsigned long offset = 0;



	if (res->flags & IORESOURCE_IO)

		offset = hose->io_offset;

	else if (res->flags & IORESOURCE_MEM)

		offset = hose->mem_offset;



	res->start = region->start + offset;

	res->end = region->end + offset;

}



int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,

			enum pci_mmap_state mmap_state, int write_combine)

{

arch/sh/drivers/pci/pci-new.c

+0 −31
Original line number Diff line number Diff line
@@ -147,37 +147,6 @@ void __devinit __weak pcibios_fixup_bus(struct pci_bus *bus) 
	}

}



void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,

			 struct resource *res)

{

	struct pci_channel *hose = dev->sysdata;

	unsigned long offset = 0;



	if (res->flags & IORESOURCE_IO)

		offset = hose->io_offset;

	else if (res->flags & IORESOURCE_MEM)

		offset = hose->mem_offset;



	region->start = res->start - offset;

	region->end = res->end - offset;

}



void __devinit

pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,

			struct pci_bus_region *region)

{

	struct pci_channel *hose = dev->sysdata;

	unsigned long offset = 0;



	if (res->flags & IORESOURCE_IO)

		offset = hose->io_offset;

	else if (res->flags & IORESOURCE_MEM)

		offset = hose->mem_offset;



	res->start = region->start + offset;

	res->end = region->end + offset;

}



int pcibios_enable_device(struct pci_dev *dev, int mask)

{

	u16 cmd, old_cmd;

arch/sh/drivers/pci/pci.c

+0 −14
Original line number Diff line number Diff line
@@ -72,20 +72,6 @@ void __devinit __weak pcibios_fixup_bus(struct pci_bus *bus) 
	pci_read_bridge_bases(bus);

}



void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,

			     struct resource *res)

{

	region->start = res->start;

	region->end = res->end;

}



void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,

			     struct pci_bus_region *region)

{

	res->start = region->start;

	res->end = region->end;

}



int pcibios_enable_device(struct pci_dev *dev, int mask)

{

	u16 cmd, old_cmd;