From ae3840a9f00cf9da81322d0f36a8e3ec2afed0fe Mon Sep 17 00:00:00 2001 From: Alan Cox Date: Mon, 21 May 2007 15:20:33 +0100 Subject: [PATCH] --- yaml --- r: 56755 b: refs/heads/master c: bc9a8a7eaa58d802a2b26c75edcc95cb92835db3 h: refs/heads/master i: 56753: 509832c7ed74ee137575a813470df733e22befd9 56751: 706f4ea666022ab98ebe0028be1eb8ba5937fc9d v: v3 --- [refs] | 2 +- trunk/drivers/ata/libata-core.c | 3 --- trunk/include/linux/libata.h | 2 -- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/[refs] b/[refs] index a8e70df83f79..a0c28faa283a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f91d81db3060f6d218e32d935b9a18ffca4dde2 +refs/heads/master: bc9a8a7eaa58d802a2b26c75edcc95cb92835db3 diff --git a/trunk/drivers/ata/libata-core.c b/trunk/drivers/ata/libata-core.c index 94ec0f524acf..c809619d23ce 100644 --- a/trunk/drivers/ata/libata-core.c +++ b/trunk/drivers/ata/libata-core.c @@ -2893,9 +2893,6 @@ int ata_do_set_mode(struct ata_port *ap, struct ata_device **r_failed_dev) if (used_dma && (ap->host->flags & ATA_HOST_SIMPLEX)) ap->host->simplex_claimed = ap; - /* step5: chip specific finalisation */ - if (ap->ops->post_set_mode) - ap->ops->post_set_mode(ap); out: if (rc) *r_failed_dev = dev; diff --git a/trunk/include/linux/libata.h b/trunk/include/linux/libata.h index 666592ef0b25..85f7b1bd1482 100644 --- a/trunk/include/linux/libata.h +++ b/trunk/include/linux/libata.h @@ -574,8 +574,6 @@ struct ata_port_operations { void (*phy_reset) (struct ata_port *ap); /* obsolete */ int (*set_mode) (struct ata_port *ap, struct ata_device **r_failed_dev); - void (*post_set_mode) (struct ata_port *ap); - int (*cable_detect) (struct ata_port *ap); int (*check_atapi_dma) (struct ata_queued_cmd *qc);