Merge branch 'master' into for_paulus

[linux-drm-fsl-dcu.git] / drivers / ata / pata_sc1200.c

diff --git a/drivers/ata/pata_sc1200.c b/drivers/ata/pata_sc1200.c
index 9b42b9a52423ee88bf8ae94bbdd94987673e2cea..58e42fbd14f939f9104758a044cda7b2f077ee72 100644 (file)
--- a/drivers/ata/pata_sc1200.c
+++ b/drivers/ata/pata_sc1200.c
@@ -27,7 +27,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- * 
+ *
  */
 
 #include <linux/kernel.h>
@@ -40,7 +40,7 @@
 #include <linux/libata.h>
 
 #define DRV_NAME       "sc1200"
-#define DRV_VERSION    "0.2.3"
+#define DRV_VERSION    "0.2.4"
 
 #define SC1200_REV_A   0x00
 #define SC1200_REV_B1  0x01
@@ -54,14 +54,14 @@
  *     Return the PCI bus clocking for the SC1200 chipset configuration
  *     in use. We return 0 for 33MHz 1 for 48MHz and 2 for 66Mhz
  */
- 
+
 static int sc1200_clock(void)
 {
        /* Magic registers that give us the chipset data */
        u8 chip_id = inb(0x903C);
        u8 silicon_rev = inb(0x903D);
        u16 pci_clock;
-       
+
        if (chip_id == 0x04 && silicon_rev < SC1200_REV_B1)
                return 0;       /* 33 MHz mode */
 
@@ -83,7 +83,7 @@ static int sc1200_clock(void)
  *
  *     Set our PIO requirements. This is fairly simple on the SC1200
  */
- 
+
 static void sc1200_set_piomode(struct ata_port *ap, struct ata_device *adev)
 {
        static const u32 pio_timings[4][5] = {
@@ -97,11 +97,11 @@ static void sc1200_set_piomode(struct ata_port *ap, struct ata_device *adev)
        u32 format;
        unsigned int reg = 0x40 + 0x10 * ap->port_no;
        int mode = adev->pio_mode - XFER_PIO_0;
-       
+
        pci_read_config_dword(pdev, reg + 4, &format);
        format >>= 31;
        format += sc1200_clock();
-       pci_write_config_dword(pdev, reg + 8 * adev->devno, 
+       pci_write_config_dword(pdev, reg + 8 * adev->devno,
                                pio_timings[format][mode]);
 }
 
@@ -113,7 +113,7 @@ static void sc1200_set_piomode(struct ata_port *ap, struct ata_device *adev)
  *     We cannot mix MWDMA and UDMA without reloading timings each switch
  *     master to slave.
  */
- 
+
 static void sc1200_set_dmamode(struct ata_port *ap, struct ata_device *adev)
 {
        static const u32 udma_timing[3][3] = {
@@ -121,13 +121,13 @@ static void sc1200_set_dmamode(struct ata_port *ap, struct ata_device *adev)
                { 0x00932470, 0x00922260, 0x00922140 },
                { 0x009436A1, 0x00933481, 0x00923261 }
        };
-       
+
        static const u32 mwdma_timing[3][3] = {
                { 0x00077771, 0x00012121, 0x00002020 },
                { 0x000BBBB2, 0x00024241, 0x00013131 },
                { 0x000FFFF3, 0x00035352, 0x00015151 }
        };
-       
+
        int clock = sc1200_clock();
        struct pci_dev *pdev = to_pci_dev(ap->host->dev);
        unsigned int reg = 0x40 + 0x10 * ap->port_no;
@@ -138,10 +138,10 @@ static void sc1200_set_dmamode(struct ata_port *ap, struct ata_device *adev)
                format = udma_timing[clock][mode - XFER_UDMA_0];
        else
                format = mwdma_timing[clock][mode - XFER_MW_DMA_0];
-       
+
        if (adev->devno == 0) {
                u32 timings;
-               
+
                pci_read_config_dword(pdev, reg + 4, &timings);
                timings &= 0x80000000UL;
                timings |= format;
@@ -186,14 +186,16 @@ static struct scsi_host_template sc1200_sht = {
        .can_queue              = ATA_DEF_QUEUE,
        .this_id                = ATA_SHT_THIS_ID,
        .sg_tablesize           = LIBATA_MAX_PRD,
-       .max_sectors            = ATA_MAX_SECTORS,
        .cmd_per_lun            = ATA_SHT_CMD_PER_LUN,
        .emulated               = ATA_SHT_EMULATED,
        .use_clustering         = ATA_SHT_USE_CLUSTERING,
        .proc_name              = DRV_NAME,
        .dma_boundary           = ATA_DMA_BOUNDARY,
        .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 sc1200_port_ops = {
@@ -201,7 +203,7 @@ static struct ata_port_operations sc1200_port_ops = {
        .set_piomode    = sc1200_set_piomode,
        .set_dmamode    = sc1200_set_dmamode,
        .mode_filter    = ata_pci_default_filter,
-       
+
        .tf_load        = ata_tf_load,
        .tf_read        = ata_tf_read,
        .check_status   = ata_check_status,
@@ -217,16 +219,16 @@ static struct ata_port_operations sc1200_port_ops = {
 
        .qc_prep        = ata_qc_prep,
        .qc_issue       = sc1200_qc_issue_prot,
-       .eng_timeout    = ata_eng_timeout,
-       .data_xfer      = ata_pio_data_xfer,
+
+       .data_xfer      = ata_data_xfer,
 
        .irq_handler    = ata_interrupt,
        .irq_clear      = ata_bmdma_irq_clear,
+       .irq_on         = ata_irq_on,
+       .irq_ack        = ata_irq_ack,
 
        .port_start     = ata_port_start,
-       .port_stop      = ata_port_stop,
-       .host_stop      = ata_host_stop
-};     
+};
 
 /**
  *     sc1200_init_one         -       Initialise an SC1200
@@ -236,7 +238,7 @@ static struct ata_port_operations sc1200_port_ops = {
  *     Just throw the needed data at the libata helper and it does all
  *     our work.
  */
- 
+
 static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id)
 {
        static struct ata_port_info info = {
@@ -248,21 +250,24 @@ static int sc1200_init_one(struct pci_dev *dev, const struct pci_device_id *id)
                .port_ops = &sc1200_port_ops
        };
        static struct ata_port_info *port_info[2] = { &info, &info };
-       
+
        /* Can't enable port 2 yet, see top comments */
        return ata_pci_init_one(dev, port_info, 1);
 }
 
-static struct pci_device_id sc1200[] = {
-       { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_IDE), },
-       { 0, },
+static const struct pci_device_id sc1200[] = {
+       { PCI_VDEVICE(NS, PCI_DEVICE_ID_NS_SCx200_IDE), },
+
+       { },
 };
 
 static struct pci_driver sc1200_pci_driver = {
-        .name          = DRV_NAME,
+       .name           = DRV_NAME,
        .id_table       = sc1200,
        .probe          = sc1200_init_one,
-       .remove         = ata_pci_remove_one
+       .remove         = ata_pci_remove_one,
+       .suspend        = ata_pci_device_suspend,
+       .resume         = ata_pci_device_resume,
 };
 
 static int __init sc1200_init(void)
@@ -270,13 +275,11 @@ static int __init sc1200_init(void)
        return pci_register_driver(&sc1200_pci_driver);
 }
 
-
 static void __exit sc1200_exit(void)
 {
        pci_unregister_driver(&sc1200_pci_driver);
 }
 
-
 MODULE_AUTHOR("Alan Cox, Mark Lord");
 MODULE_DESCRIPTION("low-level driver for the NS/AMD SC1200");
 MODULE_LICENSE("GPL");