diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:22 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2009-03-27 07:46:22 -0400 |
commit | e354c1d8033d97a97a38a1b2cffa1bc285b92ad4 (patch) | |
tree | cd520f7cd4a417c1f78d81e3a3b62936697b35f6 /drivers/ide | |
parent | d15a613ba01ff2b209ecad7a38ccbb23b3b06c92 (diff) |
ide: remove IDE_ARCH_LOCK (v2)
* Add ->{get,release}_lock methods to struct ide_port_info
and struct ide_host.
* Convert core IDE code, m68k IDE code and falconide support to use
->{get,release}_lock methods instead of ide_{get,release}_lock().
* Remove IDE_ARCH_LOCK.
v2:
* Build fix from Geert updating ide_{get,release}_lock() callers in
falconide.c.
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Michael Schmitz <schmitz@debian.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/falconide.c | 29 | ||||
-rw-r--r-- | drivers/ide/ide-io.c | 8 | ||||
-rw-r--r-- | drivers/ide/ide-probe.c | 2 |
3 files changed, 31 insertions, 8 deletions
diff --git a/drivers/ide/falconide.c b/drivers/ide/falconide.c index a638e952d67a..d4d7ff1a3516 100644 --- a/drivers/ide/falconide.c +++ b/drivers/ide/falconide.c | |||
@@ -40,8 +40,27 @@ | |||
40 | * which is shared between several drivers. | 40 | * which is shared between several drivers. |
41 | */ | 41 | */ |
42 | 42 | ||
43 | int falconide_intr_lock; | 43 | static int falconide_intr_lock; |
44 | EXPORT_SYMBOL(falconide_intr_lock); | 44 | |
45 | static void falconide_release_lock(void) | ||
46 | { | ||
47 | if (falconide_intr_lock == 0) { | ||
48 | printk(KERN_ERR "%s: bug\n", __func__); | ||
49 | return; | ||
50 | } | ||
51 | falconide_intr_lock = 0; | ||
52 | stdma_release(); | ||
53 | } | ||
54 | |||
55 | static void falconide_get_lock(irq_handler_t handler, void *data) | ||
56 | { | ||
57 | if (falconide_intr_lock == 0) { | ||
58 | if (in_interrupt() > 0) | ||
59 | panic("Falcon IDE hasn't ST-DMA lock in interrupt"); | ||
60 | stdma_lock(handler, data); | ||
61 | falconide_intr_lock = 1; | ||
62 | } | ||
63 | } | ||
45 | 64 | ||
46 | static void falconide_input_data(ide_drive_t *drive, struct request *rq, | 65 | static void falconide_input_data(ide_drive_t *drive, struct request *rq, |
47 | void *buf, unsigned int len) | 66 | void *buf, unsigned int len) |
@@ -81,6 +100,8 @@ static const struct ide_tp_ops falconide_tp_ops = { | |||
81 | }; | 100 | }; |
82 | 101 | ||
83 | static const struct ide_port_info falconide_port_info = { | 102 | static const struct ide_port_info falconide_port_info = { |
103 | .get_lock = falconide_get_lock, | ||
104 | .release_lock = falconide_release_lock, | ||
84 | .tp_ops = &falconide_tp_ops, | 105 | .tp_ops = &falconide_tp_ops, |
85 | .host_flags = IDE_HFLAG_NO_DMA | IDE_HFLAG_SERIALIZE, | 106 | .host_flags = IDE_HFLAG_NO_DMA | IDE_HFLAG_SERIALIZE, |
86 | }; | 107 | }; |
@@ -132,9 +153,9 @@ static int __init falconide_init(void) | |||
132 | goto err; | 153 | goto err; |
133 | } | 154 | } |
134 | 155 | ||
135 | ide_get_lock(NULL, NULL); | 156 | falconide_get_lock(NULL, NULL); |
136 | rc = ide_host_register(host, &falconide_port_info, hws); | 157 | rc = ide_host_register(host, &falconide_port_info, hws); |
137 | ide_release_lock(); | 158 | falconide_release_lock(); |
138 | 159 | ||
139 | if (rc) | 160 | if (rc) |
140 | goto err_free; | 161 | goto err_free; |
diff --git a/drivers/ide/ide-io.c b/drivers/ide/ide-io.c index e85060164203..030b0ea1a1e1 100644 --- a/drivers/ide/ide-io.c +++ b/drivers/ide/ide-io.c | |||
@@ -501,8 +501,8 @@ static inline int ide_lock_host(struct ide_host *host, ide_hwif_t *hwif) | |||
501 | if (host->host_flags & IDE_HFLAG_SERIALIZE) { | 501 | if (host->host_flags & IDE_HFLAG_SERIALIZE) { |
502 | rc = test_and_set_bit_lock(IDE_HOST_BUSY, &host->host_busy); | 502 | rc = test_and_set_bit_lock(IDE_HOST_BUSY, &host->host_busy); |
503 | if (rc == 0) { | 503 | if (rc == 0) { |
504 | /* for atari only */ | 504 | if (host->get_lock) |
505 | ide_get_lock(ide_intr, hwif); | 505 | host->get_lock(ide_intr, hwif); |
506 | } | 506 | } |
507 | } | 507 | } |
508 | return rc; | 508 | return rc; |
@@ -511,8 +511,8 @@ static inline int ide_lock_host(struct ide_host *host, ide_hwif_t *hwif) | |||
511 | static inline void ide_unlock_host(struct ide_host *host) | 511 | static inline void ide_unlock_host(struct ide_host *host) |
512 | { | 512 | { |
513 | if (host->host_flags & IDE_HFLAG_SERIALIZE) { | 513 | if (host->host_flags & IDE_HFLAG_SERIALIZE) { |
514 | /* for atari only */ | 514 | if (host->release_lock) |
515 | ide_release_lock(); | 515 | host->release_lock(); |
516 | clear_bit_unlock(IDE_HOST_BUSY, &host->host_busy); | 516 | clear_bit_unlock(IDE_HOST_BUSY, &host->host_busy); |
517 | } | 517 | } |
518 | } | 518 | } |
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index b0510b033d78..a3edbb5d0452 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -1325,6 +1325,8 @@ struct ide_host *ide_host_alloc(const struct ide_port_info *d, hw_regs_t **hws) | |||
1325 | 1325 | ||
1326 | if (d) { | 1326 | if (d) { |
1327 | host->init_chipset = d->init_chipset; | 1327 | host->init_chipset = d->init_chipset; |
1328 | host->get_lock = d->get_lock; | ||
1329 | host->release_lock = d->release_lock; | ||
1328 | host->host_flags = d->host_flags; | 1330 | host->host_flags = d->host_flags; |
1329 | } | 1331 | } |
1330 | 1332 | ||