Some other unlikely() should probably be removed as well.  A fresh look
reveals an over-enthusiasm for unlikely() in libata-scsi.c.
Signed-off-by: NJeff Garzik <jgarzik@redhat.com>