aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/ipr.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-08-16 03:17:03 -0400
committerJeff Garzik <jeff@garzik.org>2007-10-12 14:55:35 -0400
commitac8869d56d95a8c74403e6f7a47d74fcfcc1b988 (patch)
tree2f812aff4c6e559f3c093f9933960d09631375c8 /drivers/scsi/ipr.c
parent7d73a363dea186a864f6295bbe842da8044d42cd (diff)
[libata] Remove ->port_disable() hook
It was always set to ata_port_disable(). Removed the hook, and replaced the very few ap->ops->port_disable() callsites with direct calls to ata_port_disable(). Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/scsi/ipr.c')
-rw-r--r--drivers/scsi/ipr.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/scsi/ipr.c b/drivers/scsi/ipr.c
index 9350fbf39f77..b41dfb539021 100644
--- a/drivers/scsi/ipr.c
+++ b/drivers/scsi/ipr.c
@@ -4981,7 +4981,7 @@ static void ipr_ata_phy_reset(struct ata_port *ap)
4981 rc = ipr_device_reset(ioa_cfg, res); 4981 rc = ipr_device_reset(ioa_cfg, res);
4982 4982
4983 if (rc) { 4983 if (rc) {
4984 ap->ops->port_disable(ap); 4984 ata_port_disable(ap);
4985 goto out_unlock; 4985 goto out_unlock;
4986 } 4986 }
4987 4987
@@ -4996,7 +4996,7 @@ static void ipr_ata_phy_reset(struct ata_port *ap)
4996 break; 4996 break;
4997 default: 4997 default:
4998 ap->link.device[0].class = ATA_DEV_UNKNOWN; 4998 ap->link.device[0].class = ATA_DEV_UNKNOWN;
4999 ap->ops->port_disable(ap); 4999 ata_port_disable(ap);
5000 break; 5000 break;
5001 }; 5001 };
5002 5002
@@ -5262,7 +5262,6 @@ static u8 ipr_ata_check_altstatus(struct ata_port *ap)
5262} 5262}
5263 5263
5264static struct ata_port_operations ipr_sata_ops = { 5264static struct ata_port_operations ipr_sata_ops = {
5265 .port_disable = ata_port_disable,
5266 .check_status = ipr_ata_check_status, 5265 .check_status = ipr_ata_check_status,
5267 .check_altstatus = ipr_ata_check_altstatus, 5266 .check_altstatus = ipr_ata_check_altstatus,
5268 .dev_select = ata_noop_dev_select, 5267 .dev_select = ata_noop_dev_select,