Commit c444a2be authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

microblaze/PCI: Remove useless __pci_mmap_set_pgprot() 



The microblaze __pci_mmap_set_pgprot() was apparently copied from powerpc,
where it computes either an uncacheable pgprot_t or a write-combining one.
But on microblaze, we always use the regular uncacheable pgprot_t.

Remove the useless code in __pci_mmap_set_pgprot() and inline it at the
only call site.

Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Acked-by: default avatarYinghai Lu <yinghai@kernel.org>
parent 1e70cdd6

arch/microblaze/pci/pci-common.c

+1 −30
Original line number Original line Diff line number Diff line
@@ -218,33 +218,6 @@ static struct resource *__pci_mmap_make_offset(struct pci_dev *dev, 
	return NULL;

	return NULL;

}

}





/*

 * Set vm_page_prot of VMA, as appropriate for this architecture, for a pci

 * device mapping.

 */

static pgprot_t __pci_mmap_set_pgprot(struct pci_dev *dev, struct resource *rp,

				      pgprot_t protection,

				      enum pci_mmap_state mmap_state,

				      int write_combine)

{

	pgprot_t prot = protection;



	/* Write combine is always 0 on non-memory space mappings. On

	 * memory space, if the user didn't pass 1, we check for a

	 * "prefetchable" resource. This is a bit hackish, but we use

	 * this to workaround the inability of /sysfs to provide a write

	 * combine bit

	 */

	if (mmap_state != pci_mmap_mem)

		write_combine = 0;

	else if (write_combine == 0) {

		if (rp->flags & IORESOURCE_PREFETCH)

			write_combine = 1;

	}



	return pgprot_noncached(prot);

}



/*

/*

 * This one is used by /dev/mem and fbdev who have no clue about the

 * This one is used by /dev/mem and fbdev who have no clue about the

 * PCI device, it tries to find the PCI device first and calls the

 * PCI device, it tries to find the PCI device first and calls the
@@ -317,9 +290,7 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma, 
		return -EINVAL;

		return -EINVAL;





	vma->vm_pgoff = offset >> PAGE_SHIFT;

	vma->vm_pgoff = offset >> PAGE_SHIFT;

	vma->vm_page_prot = __pci_mmap_set_pgprot(dev, rp,

	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);

						  vma->vm_page_prot,

						  mmap_state, write_combine);





	ret = remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,

	ret = remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,

			       vma->vm_end - vma->vm_start, vma->vm_page_prot);

			       vma->vm_end - vma->vm_start, vma->vm_page_prot);