aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-24 18:22:39 -0400
committerBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2009-03-24 18:22:39 -0400
commit7362951b4818763b6abaecd3f870739125145cc1 (patch)
tree54f8840d675bcf78a90432528b8a5ff460d617e8 /drivers
parentd336ae3cf567185fb8fc03c10e9394920f7d5ab1 (diff)
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')
-rw-r--r--drivers/ide/ide-probe.c11
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)
941 int sa = 0; 941 int sa = 0;
942 942
943 mutex_lock(&ide_cfg_mtx); 943 mutex_lock(&ide_cfg_mtx);
944 spin_lock_init(&hwif->lock);
945
946 init_timer(&hwif->timer);
947 hwif->timer.function = &ide_timer_expiry;
948 hwif->timer.data = (unsigned long)hwif;
949 944
950 irq_handler = hwif->host->irq_handler; 945 irq_handler = hwif->host->irq_handler;
951 if (irq_handler == NULL) 946 if (irq_handler == NULL)
@@ -1306,6 +1301,12 @@ static void ide_init_port_data(ide_hwif_t *hwif, unsigned int index)
1306 hwif->name[2] = 'e'; 1301 hwif->name[2] = 'e';
1307 hwif->name[3] = '0' + index; 1302 hwif->name[3] = '0' + index;
1308 1303
1304 spin_lock_init(&hwif->lock);
1305
1306 init_timer(&hwif->timer);
1307 hwif->timer.function = &ide_timer_expiry;
1308 hwif->timer.data = (unsigned long)hwif;
1309
1309 init_completion(&hwif->gendev_rel_comp); 1310 init_completion(&hwif->gendev_rel_comp);
1310 1311
1311 hwif->tp_ops = &default_tp_ops; 1312 hwif->tp_ops = &default_tp_ops;