diff options
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pcmcia/db1xxx_ss.c | 19 | ||||
| -rw-r--r-- | drivers/pcmcia/xxs1500_ss.c | 16 |
2 files changed, 7 insertions, 28 deletions
diff --git a/drivers/pcmcia/db1xxx_ss.c b/drivers/pcmcia/db1xxx_ss.c index 3889cf07d6ce..9254ab0b29b1 100644 --- a/drivers/pcmcia/db1xxx_ss.c +++ b/drivers/pcmcia/db1xxx_ss.c | |||
| @@ -42,7 +42,6 @@ struct db1x_pcmcia_sock { | |||
| 42 | int nr; /* socket number */ | 42 | int nr; /* socket number */ |
| 43 | void *virt_io; | 43 | void *virt_io; |
| 44 | 44 | ||
| 45 | /* the "pseudo" addresses of the PCMCIA space. */ | ||
| 46 | phys_addr_t phys_io; | 45 | phys_addr_t phys_io; |
| 47 | phys_addr_t phys_attr; | 46 | phys_addr_t phys_attr; |
| 48 | phys_addr_t phys_mem; | 47 | phys_addr_t phys_mem; |
| @@ -437,7 +436,7 @@ static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev) | |||
| 437 | * This includes IRQs for Carddetection/ejection, the card | 436 | * This includes IRQs for Carddetection/ejection, the card |
| 438 | * itself and optional status change detection. | 437 | * itself and optional status change detection. |
| 439 | * Also, the memory areas covered by a socket. For these | 438 | * Also, the memory areas covered by a socket. For these |
| 440 | * we require the 32bit "pseudo" addresses (see the au1000.h | 439 | * we require the real 36bit addresses (see the au1000.h |
| 441 | * header for more information). | 440 | * header for more information). |
| 442 | */ | 441 | */ |
| 443 | 442 | ||
| @@ -459,11 +458,7 @@ static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev) | |||
| 459 | 458 | ||
| 460 | ret = -ENODEV; | 459 | ret = -ENODEV; |
| 461 | 460 | ||
| 462 | /* | 461 | /* 36bit PCMCIA Attribute area address */ |
| 463 | * pseudo-attr: The 32bit address of the PCMCIA attribute space | ||
| 464 | * for this socket (usually the 36bit address shifted 4 to the | ||
| 465 | * right). | ||
| 466 | */ | ||
| 467 | r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-attr"); | 462 | r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-attr"); |
| 468 | if (!r) { | 463 | if (!r) { |
| 469 | printk(KERN_ERR "pcmcia%d has no 'pseudo-attr' resource!\n", | 464 | printk(KERN_ERR "pcmcia%d has no 'pseudo-attr' resource!\n", |
| @@ -472,10 +467,7 @@ static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev) | |||
| 472 | } | 467 | } |
| 473 | sock->phys_attr = r->start; | 468 | sock->phys_attr = r->start; |
| 474 | 469 | ||
| 475 | /* | 470 | /* 36bit PCMCIA Memory area address */ |
| 476 | * pseudo-mem: The 32bit address of the PCMCIA memory space for | ||
| 477 | * this socket (usually the 36bit address shifted 4 to the right) | ||
| 478 | */ | ||
| 479 | r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-mem"); | 471 | r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-mem"); |
| 480 | if (!r) { | 472 | if (!r) { |
| 481 | printk(KERN_ERR "pcmcia%d has no 'pseudo-mem' resource!\n", | 473 | printk(KERN_ERR "pcmcia%d has no 'pseudo-mem' resource!\n", |
| @@ -484,10 +476,7 @@ static int __devinit db1x_pcmcia_socket_probe(struct platform_device *pdev) | |||
| 484 | } | 476 | } |
| 485 | sock->phys_mem = r->start; | 477 | sock->phys_mem = r->start; |
| 486 | 478 | ||
| 487 | /* | 479 | /* 36bit PCMCIA IO area address */ |
| 488 | * pseudo-io: The 32bit address of the PCMCIA IO space for this | ||
| 489 | * socket (usually the 36bit address shifted 4 to the right). | ||
| 490 | */ | ||
| 491 | r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-io"); | 480 | r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-io"); |
| 492 | if (!r) { | 481 | if (!r) { |
| 493 | printk(KERN_ERR "pcmcia%d has no 'pseudo-io' resource!\n", | 482 | printk(KERN_ERR "pcmcia%d has no 'pseudo-io' resource!\n", |
diff --git a/drivers/pcmcia/xxs1500_ss.c b/drivers/pcmcia/xxs1500_ss.c index 61560cd6e287..f9009d34254b 100644 --- a/drivers/pcmcia/xxs1500_ss.c +++ b/drivers/pcmcia/xxs1500_ss.c | |||
| @@ -218,11 +218,7 @@ static int __devinit xxs1500_pcmcia_probe(struct platform_device *pdev) | |||
| 218 | 218 | ||
| 219 | ret = -ENODEV; | 219 | ret = -ENODEV; |
| 220 | 220 | ||
| 221 | /* | 221 | /* 36bit PCMCIA Attribute area address */ |
| 222 | * pseudo-attr: The 32bit address of the PCMCIA attribute space | ||
| 223 | * for this socket (usually the 36bit address shifted 4 to the | ||
| 224 | * right). | ||
| 225 | */ | ||
| 226 | r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-attr"); | 222 | r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-attr"); |
| 227 | if (!r) { | 223 | if (!r) { |
| 228 | dev_err(&pdev->dev, "missing 'pcmcia-attr' resource!\n"); | 224 | dev_err(&pdev->dev, "missing 'pcmcia-attr' resource!\n"); |
| @@ -230,10 +226,7 @@ static int __devinit xxs1500_pcmcia_probe(struct platform_device *pdev) | |||
| 230 | } | 226 | } |
| 231 | sock->phys_attr = r->start; | 227 | sock->phys_attr = r->start; |
| 232 | 228 | ||
| 233 | /* | 229 | /* 36bit PCMCIA Memory area address */ |
| 234 | * pseudo-mem: The 32bit address of the PCMCIA memory space for | ||
| 235 | * this socket (usually the 36bit address shifted 4 to the right) | ||
| 236 | */ | ||
| 237 | r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-mem"); | 230 | r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-mem"); |
| 238 | if (!r) { | 231 | if (!r) { |
| 239 | dev_err(&pdev->dev, "missing 'pcmcia-mem' resource!\n"); | 232 | dev_err(&pdev->dev, "missing 'pcmcia-mem' resource!\n"); |
| @@ -241,10 +234,7 @@ static int __devinit xxs1500_pcmcia_probe(struct platform_device *pdev) | |||
| 241 | } | 234 | } |
| 242 | sock->phys_mem = r->start; | 235 | sock->phys_mem = r->start; |
| 243 | 236 | ||
| 244 | /* | 237 | /* 36bit PCMCIA IO area address */ |
| 245 | * pseudo-io: The 32bit address of the PCMCIA IO space for this | ||
| 246 | * socket (usually the 36bit address shifted 4 to the right). | ||
| 247 | */ | ||
| 248 | r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-io"); | 238 | r = platform_get_resource_byname(pdev, IORESOURCE_MEM, "pcmcia-io"); |
| 249 | if (!r) { | 239 | if (!r) { |
| 250 | dev_err(&pdev->dev, "missing 'pcmcia-io' resource!\n"); | 240 | dev_err(&pdev->dev, "missing 'pcmcia-io' resource!\n"); |
