diff options
| author | Bartlomiej Zolnierkiewicz | 2009-03-24 23:22:39 +0100 |
|---|---|---|
| committer | Bartlomiej Zolnierkiewicz | 2009-03-24 23:22:39 +0100 |
| commit | 7362951b4818763b6abaecd3f870739125145cc1 (patch) | |
| tree | 54f8840d675bcf78a90432528b8a5ff460d617e8 /drivers/ide/ide-probe.c | |
| parent | ide: no need to touch local IRQs in ide_probe_port() (diff) | |
| download | kernel-qcow2-linux-7362951b4818763b6abaecd3f870739125145cc1.tar.gz kernel-qcow2-linux-7362951b4818763b6abaecd3f870739125145cc1.tar.xz kernel-qcow2-linux-7362951b4818763b6abaecd3f870739125145cc1.zip | |
ide: move ->lock and ->timer init from init_irq() to ide_init_port_data()
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ide-probe.c')
| -rw-r--r-- | drivers/ide/ide-probe.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index eebd4ed29062..63f67e3c2555 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c @@ -941,11 +941,6 @@ static int init_irq (ide_hwif_t *hwif) int sa = 0; mutex_lock(&ide_cfg_mtx); - spin_lock_init(&hwif->lock); - - init_timer(&hwif->timer); - hwif->timer.function = &ide_timer_expiry; - hwif->timer.data = (unsigned long)hwif; irq_handler = hwif->host->irq_handler; if (irq_handler == NULL) @@ -1306,6 +1301,12 @@ static void ide_init_port_data(ide_hwif_t *hwif, unsigned int index) hwif->name[2] = 'e'; hwif->name[3] = '0' + index; + spin_lock_init(&hwif->lock); + + init_timer(&hwif->timer); + hwif->timer.function = &ide_timer_expiry; + hwif->timer.data = (unsigned long)hwif; + init_completion(&hwif->gendev_rel_comp); hwif->tp_ops = &default_tp_ops; |