diff options
author | Tejun Heo <htejun@gmail.com> | 2007-08-06 05:36:23 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-10-12 14:55:30 -0400 |
commit | 936fd7328657884d5a69a55666c74a55aa83ca27 (patch) | |
tree | 83a78a02d2c65ce835fe33882dfe5043d3240bff /drivers/ata/sata_sil24.c | |
parent | f58229f8060055b08b34008ea08f31de1e2f003c (diff) |
libata-link: linkify PHY-related functions
Make the following PHY-related functions to deal with ata_link instead
of ata_port.
* sata_print_link_status()
* sata_down_spd_limit()
* ata_set_sata_spd_limit() and friends
* sata_link_debounce/resume()
* sata_scr_valid/read/write/write_flush()
* ata_link_on/offline()
This patch introduces no behavior change.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
Diffstat (limited to 'drivers/ata/sata_sil24.c')
-rw-r--r-- | drivers/ata/sata_sil24.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index 2d8334e7921d..0cd40d5215fe 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c | |||
@@ -593,7 +593,7 @@ static int sil24_do_softreset(struct ata_port *ap, unsigned int *class, | |||
593 | 593 | ||
594 | DPRINTK("ENTER\n"); | 594 | DPRINTK("ENTER\n"); |
595 | 595 | ||
596 | if (ata_port_offline(ap)) { | 596 | if (ata_link_offline(&ap->link)) { |
597 | DPRINTK("PHY reports no device\n"); | 597 | DPRINTK("PHY reports no device\n"); |
598 | *class = ATA_DEV_NONE; | 598 | *class = ATA_DEV_NONE; |
599 | goto out; | 599 | goto out; |
@@ -650,10 +650,10 @@ static int sil24_hardreset(struct ata_port *ap, unsigned int *class, | |||
650 | u32 tmp; | 650 | u32 tmp; |
651 | 651 | ||
652 | /* sil24 does the right thing(tm) without any protection */ | 652 | /* sil24 does the right thing(tm) without any protection */ |
653 | sata_set_spd(ap); | 653 | sata_set_spd(&ap->link); |
654 | 654 | ||
655 | tout_msec = 100; | 655 | tout_msec = 100; |
656 | if (ata_port_online(ap)) | 656 | if (ata_link_online(&ap->link)) |
657 | tout_msec = 5000; | 657 | tout_msec = 5000; |
658 | 658 | ||
659 | writel(PORT_CS_DEV_RST, port + PORT_CTRL_STAT); | 659 | writel(PORT_CS_DEV_RST, port + PORT_CTRL_STAT); |
@@ -663,14 +663,14 @@ static int sil24_hardreset(struct ata_port *ap, unsigned int *class, | |||
663 | /* SStatus oscillates between zero and valid status after | 663 | /* SStatus oscillates between zero and valid status after |
664 | * DEV_RST, debounce it. | 664 | * DEV_RST, debounce it. |
665 | */ | 665 | */ |
666 | rc = sata_phy_debounce(ap, sata_deb_timing_long, deadline); | 666 | rc = sata_link_debounce(&ap->link, sata_deb_timing_long, deadline); |
667 | if (rc) { | 667 | if (rc) { |
668 | reason = "PHY debouncing failed"; | 668 | reason = "PHY debouncing failed"; |
669 | goto err; | 669 | goto err; |
670 | } | 670 | } |
671 | 671 | ||
672 | if (tmp & PORT_CS_DEV_RST) { | 672 | if (tmp & PORT_CS_DEV_RST) { |
673 | if (ata_port_offline(ap)) | 673 | if (ata_link_offline(&ap->link)) |
674 | return 0; | 674 | return 0; |
675 | reason = "link not ready"; | 675 | reason = "link not ready"; |
676 | goto err; | 676 | goto err; |