mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
[PATCH] mutex subsystem, semaphore to completion: IDE ->gendev_rel_sem
The patch changes semaphores that are initialized as locked to complete(). Source: MontaVista Software, Inc. Modified-by: Steven Rostedt <[email protected]> The following patch is from Montavista. I modified it slightly. Semaphores are currently being used where it makes more sense for completions. This patch corrects that. Signed-off-by: Aleksey Makarov <[email protected]> Signed-off-by: Steven Rostedt <[email protected]> Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
parent
3fe0c27761
commit
f36d4024ca
3 changed files with 9 additions and 8 deletions
|
|
@ -655,7 +655,7 @@ static void hwif_release_dev (struct device *dev)
|
|||
{
|
||||
ide_hwif_t *hwif = container_of(dev, ide_hwif_t, gendev);
|
||||
|
||||
up(&hwif->gendev_rel_sem);
|
||||
complete(&hwif->gendev_rel_comp);
|
||||
}
|
||||
|
||||
static void hwif_register (ide_hwif_t *hwif)
|
||||
|
|
@ -1327,7 +1327,7 @@ static void drive_release_dev (struct device *dev)
|
|||
drive->queue = NULL;
|
||||
spin_unlock_irq(&ide_lock);
|
||||
|
||||
up(&drive->gendev_rel_sem);
|
||||
complete(&drive->gendev_rel_comp);
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -222,7 +222,7 @@ static void init_hwif_data(ide_hwif_t *hwif, unsigned int index)
|
|||
hwif->mwdma_mask = 0x80; /* disable all mwdma */
|
||||
hwif->swdma_mask = 0x80; /* disable all swdma */
|
||||
|
||||
sema_init(&hwif->gendev_rel_sem, 0);
|
||||
init_completion(&hwif->gendev_rel_comp);
|
||||
|
||||
default_hwif_iops(hwif);
|
||||
default_hwif_transport(hwif);
|
||||
|
|
@ -245,7 +245,7 @@ static void init_hwif_data(ide_hwif_t *hwif, unsigned int index)
|
|||
drive->is_flash = 0;
|
||||
drive->vdma = 0;
|
||||
INIT_LIST_HEAD(&drive->list);
|
||||
sema_init(&drive->gendev_rel_sem, 0);
|
||||
init_completion(&drive->gendev_rel_comp);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -602,7 +602,7 @@ void ide_unregister(unsigned int index)
|
|||
}
|
||||
spin_unlock_irq(&ide_lock);
|
||||
device_unregister(&drive->gendev);
|
||||
down(&drive->gendev_rel_sem);
|
||||
wait_for_completion(&drive->gendev_rel_comp);
|
||||
spin_lock_irq(&ide_lock);
|
||||
}
|
||||
hwif->present = 0;
|
||||
|
|
@ -662,7 +662,7 @@ void ide_unregister(unsigned int index)
|
|||
/* More messed up locking ... */
|
||||
spin_unlock_irq(&ide_lock);
|
||||
device_unregister(&hwif->gendev);
|
||||
down(&hwif->gendev_rel_sem);
|
||||
wait_for_completion(&hwif->gendev_rel_comp);
|
||||
|
||||
/*
|
||||
* Remove us from the kernel's knowledge
|
||||
|
|
|
|||
Loading…
Reference in a new issue