ide: insert BUG_ON() into __ide_set_handler() (take 2)
Replace the check for hwgroup->handler and printk(KERN_CRIT, ...) at the start of __ide_set_handler() with mere BUG_ON() while removing such from the caller, ide_execute_command(). Fix up the code formatting, while at it... Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com> Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
parent
cb777922c3
commit
d30a426dc5
|
@ -786,15 +786,11 @@ static void __ide_set_handler (ide_drive_t *drive, ide_handler_t *handler,
|
||||||
{
|
{
|
||||||
ide_hwgroup_t *hwgroup = HWGROUP(drive);
|
ide_hwgroup_t *hwgroup = HWGROUP(drive);
|
||||||
|
|
||||||
if (hwgroup->handler != NULL) {
|
BUG_ON(hwgroup->handler);
|
||||||
printk(KERN_CRIT "%s: ide_set_handler: handler not null; "
|
|
||||||
"old=%p, new=%p\n",
|
|
||||||
drive->name, hwgroup->handler, handler);
|
|
||||||
}
|
|
||||||
hwgroup->handler = handler;
|
hwgroup->handler = handler;
|
||||||
hwgroup->expiry = expiry;
|
hwgroup->expiry = expiry;
|
||||||
hwgroup->timer.expires = jiffies + timeout;
|
hwgroup->timer.expires = jiffies + timeout;
|
||||||
hwgroup->req_gen_timer = hwgroup->req_gen;
|
hwgroup->req_gen_timer = hwgroup->req_gen;
|
||||||
add_timer(&hwgroup->timer);
|
add_timer(&hwgroup->timer);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -827,11 +823,9 @@ void ide_execute_command(ide_drive_t *drive, u8 cmd, ide_handler_t *handler,
|
||||||
unsigned timeout, ide_expiry_t *expiry)
|
unsigned timeout, ide_expiry_t *expiry)
|
||||||
{
|
{
|
||||||
unsigned long flags;
|
unsigned long flags;
|
||||||
ide_hwgroup_t *hwgroup = HWGROUP(drive);
|
|
||||||
ide_hwif_t *hwif = HWIF(drive);
|
ide_hwif_t *hwif = HWIF(drive);
|
||||||
|
|
||||||
spin_lock_irqsave(&ide_lock, flags);
|
spin_lock_irqsave(&ide_lock, flags);
|
||||||
BUG_ON(hwgroup->handler);
|
|
||||||
__ide_set_handler(drive, handler, timeout, expiry);
|
__ide_set_handler(drive, handler, timeout, expiry);
|
||||||
hwif->OUTBSYNC(drive, cmd, IDE_COMMAND_REG);
|
hwif->OUTBSYNC(drive, cmd, IDE_COMMAND_REG);
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue