Commit a15d2ddb authored by Michal Sojka's avatar Michal Sojka Committed by Greg Kroah-Hartman
Browse files

uio_mf624: Refactor memory info initialization 



No functional changes. Move initialization of struct uio_mem to a
function. This will allow the next commit to change the initialization
code at a single place rather that at three different places.

Signed-off-by: default avatarMichal Sojka <sojkam1@fel.cvut.cz>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 171058fb

drivers/uio/uio_mf624.c

+18 −26
Original line number Original line Diff line number Diff line
@@ -127,6 +127,20 @@ static int mf624_irqcontrol(struct uio_info *info, s32 irq_on) 
	return 0;

	return 0;

}

}





static int mf624_setup_mem(struct pci_dev *dev, int bar, struct uio_mem *mem, const char *name)

{

	mem->name = name;

	mem->addr = pci_resource_start(dev, bar);

	if (!mem->addr)

		return -ENODEV;

	mem->size = pci_resource_len(dev, bar);

	mem->memtype = UIO_MEM_PHYS;

	mem->internal_addr = pci_ioremap_bar(dev, bar);

	if (!mem->internal_addr)

		return -ENODEV;

	return 0;

}



static int mf624_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)

static int mf624_pci_probe(struct pci_dev *dev, const struct pci_device_id *id)

{

{

	struct uio_info *info;

	struct uio_info *info;
@@ -147,37 +161,15 @@ static int mf624_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) 
	/* Note: Datasheet says device uses BAR0, BAR1, BAR2 -- do not trust it */

	/* Note: Datasheet says device uses BAR0, BAR1, BAR2 -- do not trust it */





	/* BAR0 */

	/* BAR0 */

	info->mem[0].name = "PCI chipset, interrupts, status "

	if (mf624_setup_mem(dev, 0, &info->mem[0], "PCI chipset, interrupts, status "

			"bits, special functions";

			    "bits, special functions"))

	info->mem[0].addr = pci_resource_start(dev, 0);

	if (!info->mem[0].addr)

		goto out_release;

	info->mem[0].size = pci_resource_len(dev, 0);

	info->mem[0].memtype = UIO_MEM_PHYS;

	info->mem[0].internal_addr = pci_ioremap_bar(dev, 0);

	if (!info->mem[0].internal_addr)

		goto out_release;

		goto out_release;



	/* BAR2 */

	/* BAR2 */

	info->mem[1].name = "ADC, DAC, DIO";

	if (mf624_setup_mem(dev, 2, &info->mem[1], "ADC, DAC, DIO"))

	info->mem[1].addr = pci_resource_start(dev, 2);

	if (!info->mem[1].addr)

		goto out_unmap0;

	info->mem[1].size = pci_resource_len(dev, 2);

	info->mem[1].memtype = UIO_MEM_PHYS;

	info->mem[1].internal_addr = pci_ioremap_bar(dev, 2);

	if (!info->mem[1].internal_addr)

		goto out_unmap0;

		goto out_unmap0;





	/* BAR4 */

	/* BAR4 */

	info->mem[2].name = "Counter/timer chip";

	if (mf624_setup_mem(dev, 4, &info->mem[2], "Counter/timer chip"))

	info->mem[2].addr = pci_resource_start(dev, 4);

	if (!info->mem[2].addr)

		goto out_unmap1;

	info->mem[2].size = pci_resource_len(dev, 4);

	info->mem[2].memtype = UIO_MEM_PHYS;

	info->mem[2].internal_addr = pci_ioremap_bar(dev, 4);

	if (!info->mem[2].internal_addr)

		goto out_unmap1;

		goto out_unmap1;





	info->irq = dev->irq;

	info->irq = dev->irq;

CRA Git | Maintained and supported by SUSTech CRA and CCSE