leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging: ipack: Rename IPACK_MEM_SPACE to IPACK_MEM8_SPACE.

Browse Source 
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: Jens Taprogge <jens.taprogge@taprogge.org>
Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jens Taprogge 2012-09-27 12:37:36 +02:00 committed by Greg Kroah-Hartman
parent a93963ab01
commit fe4a3ed0d5
3 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
drivers/staging/ipack/bridges/tpci200.c
View File

@ -29,17 +29,17 @@ static const u16 tpci200_status_error[] = {
}; };
static const size_t tpci200_space_size[IPACK_SPACE_COUNT] = { static const size_t tpci200_space_size[IPACK_SPACE_COUNT] = {
[IPACK_IO_SPACE] = TPCI200_IO_SPACE_SIZE, [IPACK_IO_SPACE] = TPCI200_IO_SPACE_SIZE,
[IPACK_ID_SPACE] = TPCI200_ID_SPACE_SIZE, [IPACK_ID_SPACE] = TPCI200_ID_SPACE_SIZE,
[IPACK_INT_SPACE] = TPCI200_INT_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] = { static const size_t tpci200_space_interval[IPACK_SPACE_COUNT] = {
[IPACK_IO_SPACE] = TPCI200_IO_SPACE_INTERVAL, [IPACK_IO_SPACE] = TPCI200_IO_SPACE_INTERVAL,
[IPACK_ID_SPACE] = TPCI200_ID_SPACE_INTERVAL, [IPACK_ID_SPACE] = TPCI200_ID_SPACE_INTERVAL,
[IPACK_INT_SPACE] = TPCI200_INT_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) 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; 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, res = pci_request_region(tpci200->info->pdev, TPCI200_MEM8_SPACE_BAR,
"Carrier MEM space"); "Carrier MEM8 space");
if (res) { if (res) {
dev_err(&tpci200->info->pdev->dev, 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->bus->number,
tpci200->info->pdev->devfn); tpci200->info->pdev->devfn);
goto out_release_ioid_int_space; 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_ID_SPACE] = ioidint_base + TPCI200_ID_SPACE_OFF;
tpci200->mod_mem[IPACK_INT_SPACE] = tpci200->mod_mem[IPACK_INT_SPACE] =
ioidint_base + TPCI200_INT_SPACE_OFF; ioidint_base + TPCI200_INT_SPACE_OFF;
tpci200->mod_mem[IPACK_MEM_SPACE] = tpci200->mod_mem[IPACK_MEM8_SPACE] =
pci_resource_start(tpci200->info->pdev, pci_resource_start(tpci200->info->pdev,
TPCI200_MEM8_SPACE_BAR); TPCI200_MEM8_SPACE_BAR);

10
drivers/staging/ipack/devices/ipoctal.c
View File

@ -53,7 +53,7 @@ struct ipoctal {
struct ipoctal_channel channel[NR_CHANNELS]; struct ipoctal_channel channel[NR_CHANNELS];
unsigned char write; unsigned char write;
struct tty_driver *tty_drv; struct tty_driver *tty_drv;
u8 __iomem *mem_space; u8 __iomem *mem8_space;
u8 __iomem *int_space; u8 __iomem *int_space;
}; };
@ -306,13 +306,13 @@ static int ipoctal_inst_slot(struct ipoctal *ipoctal, unsigned int bus_nr,
return -EADDRNOTAVAIL; return -EADDRNOTAVAIL;
} }
region = &ipoctal->dev->region[IPACK_MEM_SPACE]; region = &ipoctal->dev->region[IPACK_MEM8_SPACE];
ipoctal->mem_space = ipoctal->mem8_space =
devm_ioremap_nocache(&ipoctal->dev->dev, devm_ioremap_nocache(&ipoctal->dev->dev,
region->start, 0x8000); region->start, 0x8000);
if (!addr) { if (!addr) {
dev_err(&ipoctal->dev->dev, 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); bus_nr, slot);
return -EADDRNOTAVAIL; 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->dev->bus->ops->request_irq(ipoctal->dev,
ipoctal_irq_handler, ipoctal); ipoctal_irq_handler, ipoctal);
/* Dummy write */ /* Dummy write */
iowrite8(1, ipoctal->mem_space + 1); iowrite8(1, ipoctal->mem8_space + 1);
/* Register the TTY device */ /* Register the TTY device */

2
drivers/staging/ipack/ipack.h
View File

@ -34,8 +34,8 @@ struct ipack_driver;
enum ipack_space { enum ipack_space {
IPACK_IO_SPACE = 0, IPACK_IO_SPACE = 0,
IPACK_ID_SPACE, IPACK_ID_SPACE,
IPACK_MEM_SPACE,
IPACK_INT_SPACE, IPACK_INT_SPACE,
IPACK_MEM8_SPACE,
/* Dummy for counting the number of entries. Must remain the last /* Dummy for counting the number of entries. Must remain the last
* entry */ * entry */
IPACK_SPACE_COUNT, IPACK_SPACE_COUNT,