ide: insert BUG_ON() into __ide_set_handler() (take 2)
PATCH 1/1 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 <[email protected]>
---
Oops, forgot to remove no longer needed variable... :-[
drivers/ide/ide-iops.c | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-)
drivers/ide/ide-iops.c +2 -8
@@ -786,15 +786,11 @@ static void __ide_set_handler (ide_drive {ide_hwgroup_t *hwgroup =HWGROUP (drive); -if (hwgroup->handler !=NULL ) { -printk (KERN_CRIT "%s: ide_set_handler: handler not null; " -"old=%p, new=%p\n" , - drive->name, hwgroup->handler, handler); - } +BUG_ON (hwgroup->handler); hwgroup->handler = handler; hwgroup->expiry = expiry; hwgroup->timer.expires = jiffies + timeout; - hwgroup->req_gen_timer = hwgroup->req_gen; + hwgroup->req_gen_timer = hwgroup->req_gen;add_timer (&hwgroup->timer); }
@@ -827,11 +823,9 @@ void ide_execute_command(ide_drive_t *dr unsigned timeout, ide_expiry_t *expiry) { unsigned long flags; -ide_hwgroup_t *hwgroup =HWGROUP (drive);ide_hwif_t *hwif =HWIF (drive);spin_lock_irqsave (&ide_lock, flags); -BUG_ON (hwgroup->handler);__ide_set_handler (drive, handler, timeout, expiry); hwif->OUTBSYNC (drive, cmd,IDE_COMMAND_REG );/*
Bartlomiej Zolnierkiewicz
AppliedQuoted 5 lines · Sergei Shtylyov
Replace the check for
hwgroup->handlerandprintk(KERN_CRIT, ...)at the start of__ide_set_handler()with mereBUG_ON()while removing such from the caller,ide_execute_command(). Fix up the code formatting, while at it...Signed-off-by Sergei Shtylyov <[email protected]>
thanks, applied