libata: Fix build failure on ppc64 drivers/ata/pata_scc.c

[linux-2.6-omap-h63xx.git] / drivers / ata / pata_cmd640.c

diff --git a/drivers/ata/pata_cmd640.c b/drivers/ata/pata_cmd640.c
index 4d01d4692412dc89172d60d087a5e5105eef02e9..43d198f909680f926464e1583e650166c193b435 100644 (file)
--- a/drivers/ata/pata_cmd640.c
+++ b/drivers/ata/pata_cmd640.c
@@ -23,7 +23,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME "pata_cmd640"
-#define DRV_VERSION "0.0.3"
+#define DRV_VERSION "0.0.5"
 
 struct cmd640_reg {
        int last;
@@ -43,6 +43,7 @@ enum {
 
 /**
  *     cmd640_set_piomode      -       set initial PIO mode data
+ *     @ap: ATA port
  *     @adev: ATA device
  *
  *     Called to do the PIO mode setup.
@@ -152,7 +153,7 @@ static int cmd640_port_start(struct ata_port *ap)
        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
        struct cmd640_reg *timing;
 
-       int ret = ata_port_start(ap);
+       int ret = ata_sff_port_start(ap);
        if (ret < 0)
                return ret;
 
@@ -180,12 +181,9 @@ static struct scsi_host_template cmd640_sht = {
        .slave_configure        = ata_scsi_slave_config,
        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
-       .resume                 = ata_scsi_device_resume,
-       .suspend                = ata_scsi_device_suspend,
 };
 
 static struct ata_port_operations cmd640_port_ops = {
-       .port_disable   = ata_port_disable,
        .set_piomode    = cmd640_set_piomode,
        .mode_filter    = ata_pci_default_filter,
        .tf_load        = ata_tf_load,
@@ -214,27 +212,17 @@ static struct ata_port_operations cmd640_port_ops = {
        .irq_handler    = ata_interrupt,
        .irq_clear      = ata_bmdma_irq_clear,
        .irq_on         = ata_irq_on,
-       .irq_ack        = ata_irq_ack,
 
        .port_start     = cmd640_port_start,
 };
 
-static int cmd640_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
+static void cmd640_hardware_init(struct pci_dev *pdev)
 {
        u8 r;
        u8 ctrl;
 
-       static struct ata_port_info info = {
-               .sht = &cmd640_sht,
-               .flags = ATA_FLAG_SLAVE_POSS | ATA_FLAG_SRST,
-               .pio_mask = 0x1f,
-               .port_ops = &cmd640_port_ops
-       };
-
-       static struct ata_port_info *port_info[2] = { &info, &info };
-
        /* CMD640 detected, commiserations */
-       pci_write_config_byte(pdev, 0x5C, 0x00);
+       pci_write_config_byte(pdev, 0x5B, 0x00);
        /* Get version info */
        pci_read_config_byte(pdev, CFR, &r);
        /* PIO0 command cycles */
@@ -255,13 +243,30 @@ static int cmd640_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
        pci_read_config_byte(pdev, ARTIM23, &ctrl);
        ctrl |= 0x0C;
        pci_write_config_byte(pdev, ARTIM23, ctrl);
+}
+
+static int cmd640_init_one(struct pci_dev *pdev, const struct pci_device_id *id)
+{
+       static const struct ata_port_info info = {
+               .sht = &cmd640_sht,
+               .flags = ATA_FLAG_SLAVE_POSS,
+               .pio_mask = 0x1f,
+               .port_ops = &cmd640_port_ops
+       };
+       const struct ata_port_info *ppi[] = { &info, NULL };
 
-       return ata_pci_init_one(pdev, port_info, 2);
+       cmd640_hardware_init(pdev);
+       return ata_pci_init_one(pdev, ppi);
 }
 
 static int cmd640_reinit_one(struct pci_dev *pdev)
 {
+       cmd640_hardware_init(pdev);
+#ifdef CONFIG_PM
        return ata_pci_device_resume(pdev);
+#else
+       return 0;
+#endif
 }
 
 static const struct pci_device_id cmd640[] = {
@@ -274,7 +279,9 @@ static struct pci_driver cmd640_pci_driver = {
        .id_table       = cmd640,
        .probe          = cmd640_init_one,
        .remove         = ata_pci_remove_one,
+#ifdef CONFIG_PM
        .suspend        = ata_pci_device_suspend,
+#endif
        .resume         = cmd640_reinit_one,
 };