mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-24 09:50:04 +00:00
ide: move ->lock and ->timer init from init_irq() to ide_init_port_data()
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
d336ae3cf5
commit
7362951b48
1 changed files with 6 additions and 5 deletions
|
@ -941,11 +941,6 @@ static int init_irq (ide_hwif_t *hwif)
|
||||||
int sa = 0;
|
int sa = 0;
|
||||||
|
|
||||||
mutex_lock(&ide_cfg_mtx);
|
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;
|
irq_handler = hwif->host->irq_handler;
|
||||||
if (irq_handler == NULL)
|
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[2] = 'e';
|
||||||
hwif->name[3] = '0' + index;
|
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);
|
init_completion(&hwif->gendev_rel_comp);
|
||||||
|
|
||||||
hwif->tp_ops = &default_tp_ops;
|
hwif->tp_ops = &default_tp_ops;
|
||||||
|
|
Loading…
Reference in a new issue