Commit fe4a3ed0 authored by Jens Taprogge's avatar Jens Taprogge Committed by Greg Kroah-Hartman
Browse files

staging: ipack: Rename IPACK_MEM_SPACE to IPACK_MEM8_SPACE. 



There also is a MEM16 space.  This will make it clear which one is
which, once support for MEM16 space is added.

Signed-off-by: default avatarJens Taprogge <jens.taprogge@taprogge.org>
Signed-off-by: default avatarSamuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent a93963ab

drivers/staging/ipack/bridges/tpci200.c

+12 −12
Original line number Diff line number Diff line
@@ -32,14 +32,14 @@ static const size_t tpci200_space_size[IPACK_SPACE_COUNT] = { 
	[IPACK_IO_SPACE]    = TPCI200_IO_SPACE_SIZE,

	[IPACK_ID_SPACE]    = TPCI200_ID_SPACE_SIZE,

	[IPACK_INT_SPACE]   = TPCI200_INT_SPACE_SIZE,

	[IPACK_MEM_SPACE] = TPCI200_MEM8_SPACE_SIZE,

	[IPACK_MEM8_SPACE]  = TPCI200_MEM8_SPACE_SIZE,

};



static const size_t tpci200_space_interval[IPACK_SPACE_COUNT] = {

	[IPACK_IO_SPACE]    = TPCI200_IO_SPACE_INTERVAL,

	[IPACK_ID_SPACE]    = TPCI200_ID_SPACE_INTERVAL,

	[IPACK_INT_SPACE]   = TPCI200_INT_SPACE_INTERVAL,

	[IPACK_MEM_SPACE] = TPCI200_MEM8_SPACE_INTERVAL,

	[IPACK_MEM8_SPACE]  = TPCI200_MEM8_SPACE_INTERVAL,

};



static struct tpci200_board *check_slot(struct ipack_device *dev)
@@ -271,12 +271,12 @@ static int tpci200_register(struct tpci200_board *tpci200) 
		goto out_release_ip_space;

	}



	/* Request MEM space (Bar 4) */

	/* Request MEM8 space (Bar 5) */

	res = pci_request_region(tpci200->info->pdev, TPCI200_MEM8_SPACE_BAR,

				 "Carrier MEM space");

				 "Carrier MEM8 space");

	if (res) {

		dev_err(&tpci200->info->pdev->dev,

			"(bn 0x%X, sn 0x%X) failed to allocate PCI resource for BAR 4!",

			"(bn 0x%X, sn 0x%X) failed to allocate PCI resource for BAR 5!",

			tpci200->info->pdev->bus->number,

			tpci200->info->pdev->devfn);

		goto out_release_ioid_int_space;
@@ -297,7 +297,7 @@ static int tpci200_register(struct tpci200_board *tpci200) 
	tpci200->mod_mem[IPACK_ID_SPACE] = ioidint_base + TPCI200_ID_SPACE_OFF;

	tpci200->mod_mem[IPACK_INT_SPACE] =

		ioidint_base + TPCI200_INT_SPACE_OFF;

	tpci200->mod_mem[IPACK_MEM_SPACE] =

	tpci200->mod_mem[IPACK_MEM8_SPACE] =

		pci_resource_start(tpci200->info->pdev,

				   TPCI200_MEM8_SPACE_BAR);

drivers/staging/ipack/devices/ipoctal.c

+5 −5
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ struct ipoctal { 
	struct ipoctal_channel		channel[NR_CHANNELS];

	unsigned char			write;

	struct tty_driver		*tty_drv;

	u8 __iomem			*mem_space;

	u8 __iomem			*mem8_space;

	u8 __iomem			*int_space;

};
@@ -306,13 +306,13 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr, 
		return -EADDRNOTAVAIL;

	}



	region = &ipoctal->dev->region[IPACK_MEM_SPACE];

	ipoctal->mem_space =

	region = &ipoctal->dev->region[IPACK_MEM8_SPACE];

	ipoctal->mem8_space =

		devm_ioremap_nocache(&ipoctal->dev->dev,

				     region->start, 0x8000);

	if (!addr) {

		dev_err(&ipoctal->dev->dev,

			"Unable to map slot [%d:%d] MEM space!\n",

			"Unable to map slot [%d:%d] MEM8 space!\n",

			bus_nr, slot);

		return -EADDRNOTAVAIL;

	}
@@ -359,7 +359,7 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr, 
	ipoctal->dev->bus->ops->request_irq(ipoctal->dev,

				       ipoctal_irq_handler, ipoctal);

	/* Dummy write */

	iowrite8(1, ipoctal->mem_space + 1);

	iowrite8(1, ipoctal->mem8_space + 1);



	/* Register the TTY device */

drivers/staging/ipack/ipack.h

+1 −1
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ struct ipack_driver; 
enum ipack_space {

	IPACK_IO_SPACE    = 0,

	IPACK_ID_SPACE,

	IPACK_MEM_SPACE,

	IPACK_INT_SPACE,

	IPACK_MEM8_SPACE,

	/* Dummy for counting the number of entries.  Must remain the last

	 * entry */

	IPACK_SPACE_COUNT,

CRA Git | Maintained and supported by SUSTech CRA and CCSE