diff options
Diffstat (limited to 'drivers/mtd/maps/pcmciamtd.c')
-rw-r--r-- | drivers/mtd/maps/pcmciamtd.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/mtd/maps/pcmciamtd.c b/drivers/mtd/maps/pcmciamtd.c index ff7c50d10180..af24216a0626 100644 --- a/drivers/mtd/maps/pcmciamtd.c +++ b/drivers/mtd/maps/pcmciamtd.c | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * $Id: pcmciamtd.c,v 1.51 2004/07/12 22:38:29 dwmw2 Exp $ | 2 | * $Id: pcmciamtd.c,v 1.55 2005/11/07 11:14:28 gleixner Exp $ |
3 | * | 3 | * |
4 | * pcmciamtd.c - MTD driver for PCMCIA flash memory cards | 4 | * pcmciamtd.c - MTD driver for PCMCIA flash memory cards |
5 | * | 5 | * |
@@ -48,7 +48,7 @@ static const int debug = 0; | |||
48 | 48 | ||
49 | 49 | ||
50 | #define DRIVER_DESC "PCMCIA Flash memory card driver" | 50 | #define DRIVER_DESC "PCMCIA Flash memory card driver" |
51 | #define DRIVER_VERSION "$Revision: 1.51 $" | 51 | #define DRIVER_VERSION "$Revision: 1.55 $" |
52 | 52 | ||
53 | /* Size of the PCMCIA address space: 26 bits = 64 MB */ | 53 | /* Size of the PCMCIA address space: 26 bits = 64 MB */ |
54 | #define MAX_PCMCIA_ADDR 0x4000000 | 54 | #define MAX_PCMCIA_ADDR 0x4000000 |
@@ -176,7 +176,7 @@ static void pcmcia_copy_from_remap(struct map_info *map, void *to, unsigned long | |||
176 | 176 | ||
177 | if(toread > len) | 177 | if(toread > len) |
178 | toread = len; | 178 | toread = len; |
179 | 179 | ||
180 | addr = remap_window(map, from); | 180 | addr = remap_window(map, from); |
181 | if(!addr) | 181 | if(!addr) |
182 | return; | 182 | return; |
@@ -386,7 +386,7 @@ static void card_settings(struct pcmciamtd_dev *dev, dev_link_t *link, int *new_ | |||
386 | cs_error(link->handle, ParseTuple, rc); | 386 | cs_error(link->handle, ParseTuple, rc); |
387 | break; | 387 | break; |
388 | } | 388 | } |
389 | 389 | ||
390 | switch(tuple.TupleCode) { | 390 | switch(tuple.TupleCode) { |
391 | case CISTPL_FORMAT: { | 391 | case CISTPL_FORMAT: { |
392 | cistpl_format_t *t = &parse.format; | 392 | cistpl_format_t *t = &parse.format; |
@@ -394,9 +394,9 @@ static void card_settings(struct pcmciamtd_dev *dev, dev_link_t *link, int *new_ | |||
394 | DEBUG(2, "Format type: %u, Error Detection: %u, offset = %u, length =%u", | 394 | DEBUG(2, "Format type: %u, Error Detection: %u, offset = %u, length =%u", |
395 | t->type, t->edc, t->offset, t->length); | 395 | t->type, t->edc, t->offset, t->length); |
396 | break; | 396 | break; |
397 | 397 | ||
398 | } | 398 | } |
399 | 399 | ||
400 | case CISTPL_DEVICE: { | 400 | case CISTPL_DEVICE: { |
401 | cistpl_device_t *t = &parse.device; | 401 | cistpl_device_t *t = &parse.device; |
402 | int i; | 402 | int i; |
@@ -410,7 +410,7 @@ static void card_settings(struct pcmciamtd_dev *dev, dev_link_t *link, int *new_ | |||
410 | } | 410 | } |
411 | break; | 411 | break; |
412 | } | 412 | } |
413 | 413 | ||
414 | case CISTPL_VERS_1: { | 414 | case CISTPL_VERS_1: { |
415 | cistpl_vers_1_t *t = &parse.version_1; | 415 | cistpl_vers_1_t *t = &parse.version_1; |
416 | int i; | 416 | int i; |
@@ -425,7 +425,7 @@ static void card_settings(struct pcmciamtd_dev *dev, dev_link_t *link, int *new_ | |||
425 | DEBUG(2, "Found name: %s", dev->mtd_name); | 425 | DEBUG(2, "Found name: %s", dev->mtd_name); |
426 | break; | 426 | break; |
427 | } | 427 | } |
428 | 428 | ||
429 | case CISTPL_JEDEC_C: { | 429 | case CISTPL_JEDEC_C: { |
430 | cistpl_jedec_t *t = &parse.jedec; | 430 | cistpl_jedec_t *t = &parse.jedec; |
431 | int i; | 431 | int i; |
@@ -434,7 +434,7 @@ static void card_settings(struct pcmciamtd_dev *dev, dev_link_t *link, int *new_ | |||
434 | } | 434 | } |
435 | break; | 435 | break; |
436 | } | 436 | } |
437 | 437 | ||
438 | case CISTPL_DEVICE_GEO: { | 438 | case CISTPL_DEVICE_GEO: { |
439 | cistpl_device_geo_t *t = &parse.device_geo; | 439 | cistpl_device_geo_t *t = &parse.device_geo; |
440 | int i; | 440 | int i; |
@@ -449,11 +449,11 @@ static void card_settings(struct pcmciamtd_dev *dev, dev_link_t *link, int *new_ | |||
449 | } | 449 | } |
450 | break; | 450 | break; |
451 | } | 451 | } |
452 | 452 | ||
453 | default: | 453 | default: |
454 | DEBUG(2, "Unknown tuple code %d", tuple.TupleCode); | 454 | DEBUG(2, "Unknown tuple code %d", tuple.TupleCode); |
455 | } | 455 | } |
456 | 456 | ||
457 | rc = pcmcia_get_next_tuple(link->handle, &tuple); | 457 | rc = pcmcia_get_next_tuple(link->handle, &tuple); |
458 | } | 458 | } |
459 | if(!dev->pcmcia_map.size) | 459 | if(!dev->pcmcia_map.size) |
@@ -470,7 +470,7 @@ static void card_settings(struct pcmciamtd_dev *dev, dev_link_t *link, int *new_ | |||
470 | if(bankwidth) { | 470 | if(bankwidth) { |
471 | dev->pcmcia_map.bankwidth = bankwidth; | 471 | dev->pcmcia_map.bankwidth = bankwidth; |
472 | DEBUG(2, "bankwidth forced to %d", bankwidth); | 472 | DEBUG(2, "bankwidth forced to %d", bankwidth); |
473 | } | 473 | } |
474 | 474 | ||
475 | dev->pcmcia_map.name = dev->mtd_name; | 475 | dev->pcmcia_map.name = dev->mtd_name; |
476 | if(!dev->mtd_name[0]) { | 476 | if(!dev->mtd_name[0]) { |
@@ -568,7 +568,7 @@ static void pcmciamtd_config(dev_link_t *link) | |||
568 | return; | 568 | return; |
569 | } | 569 | } |
570 | DEBUG(1, "Allocated a window of %dKiB", dev->win_size >> 10); | 570 | DEBUG(1, "Allocated a window of %dKiB", dev->win_size >> 10); |
571 | 571 | ||
572 | /* Get write protect status */ | 572 | /* Get write protect status */ |
573 | CS_CHECK(GetStatus, pcmcia_get_status(link->handle, &status)); | 573 | CS_CHECK(GetStatus, pcmcia_get_status(link->handle, &status)); |
574 | DEBUG(2, "status value: 0x%x window handle = 0x%8.8lx", | 574 | DEBUG(2, "status value: 0x%x window handle = 0x%8.8lx", |
@@ -624,11 +624,11 @@ static void pcmciamtd_config(dev_link_t *link) | |||
624 | mtd = do_map_probe(probes[i], &dev->pcmcia_map); | 624 | mtd = do_map_probe(probes[i], &dev->pcmcia_map); |
625 | if(mtd) | 625 | if(mtd) |
626 | break; | 626 | break; |
627 | 627 | ||
628 | DEBUG(1, "FAILED: %s", probes[i]); | 628 | DEBUG(1, "FAILED: %s", probes[i]); |
629 | } | 629 | } |
630 | } | 630 | } |
631 | 631 | ||
632 | if(!mtd) { | 632 | if(!mtd) { |
633 | DEBUG(1, "Cant find an MTD"); | 633 | DEBUG(1, "Cant find an MTD"); |
634 | pcmciamtd_release(link); | 634 | pcmciamtd_release(link); |