PATA libata: suspend/resume simple cases
PATCH 1/1 PATA libata: suspend/resume simple cases
This patch adds the suspend/resume callbacks for drivers which don't need any additional help (beyond the pci resume quirk patch I posted earlier anyway). Also bring version numbers back inline with master copies.
Signed-off-by Alan Cox <[email protected]>
drivers/ata/ata_generic.c +6 -2
@@ -26,7 +26,7 @@#include <linux/libata.h> #define DRV_NAME "ata_generic" -#define DRV_VERSION "0.2.7" +#define DRV_VERSION "0.2.10"/* * A generic parallel ATA driver using libata
@@ -117,6 +117,8 @@ .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, };static struct ata_port_operations generic_port_ops = {
@@ -225,7 +227,9 @@ .name = DRV_NAME, .id_table = ata_generic, .probe = ata_generic_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 ata_generic_init (void )
drivers/ata/pata_atiixp.c +6 -2
@@ -22,7 +22,7 @@#include <linux/libata.h> #define DRV_NAME "pata_atiixp" -#define DRV_VERSION "0.4.3" +#define DRV_VERSION "0.4.4"enum {ATIIXP_IDE_PIO_TIMING =0x40 ,
@@ -217,6 +217,8 @@ .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, };static struct ata_port_operations atiixp_port_ops = {
@@ -280,7 +282,9 @@ .name = DRV_NAME, .id_table = atiixp, .probe = atiixp_init_one, - .remove = ata_pci_remove_one + .remove = ata_pci_remove_one, + .resume = ata_pci_device_resume, + .suspend = ata_pci_device_suspend, };static int __init atiixp_init (void )
drivers/ata/pata_cs5535.c +5 -1
@@ -39,7 +39,7 @@#include <asm/msr.h> #define DRV_NAME "cs5535" -#define DRV_VERSION "0.2.10" +#define DRV_VERSION "0.2.11"/* * The Geode (Aka Athlon GX now) uses an internal MSR based
@@ -185,6 +185,8 @@ .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, };static struct ata_port_operations cs5535_port_ops = {
@@ -268,6 +270,8 @@ .id_table = cs5535, .probe = cs5535_init_one, .remove = ata_pci_remove_one + .suspend = ata_pci_device_suspend, + .resume = ata_pci_device_resume, };static int __init cs5535_init (void )
drivers/ata/pata_cypress.c +6 -2
@@ -18,7 +18,7 @@#include <linux/libata.h> #define DRV_NAME "pata_cypress" -#define DRV_VERSION "0.1.2" +#define DRV_VERSION "0.1.4"/* here are the offset definitions for the registers */
@@ -136,6 +136,8 @@ .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, };static struct ata_port_operations cy82c693_port_ops = {
@@ -203,7 +205,9 @@ .name = DRV_NAME, .id_table = cy82c693, .probe = cy82c693_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 cy82c693_init (void )
drivers/ata/pata_efar.c +5 -1
@@ -22,7 +22,7 @@#include <linux/ata.h> #define DRV_NAME "pata_efar" -#define DRV_VERSION "0.4.2" +#define DRV_VERSION "0.4.3"/** * efar_pre_reset - check for 40/80 pin
@@ -234,6 +234,8 @@ .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, };static const struct ata_port_operations efar_ops = {
@@ -315,6 +317,8 @@ .id_table = efar_pci_tbl, .probe = efar_init_one, .remove = ata_pci_remove_one, + .suspend = ata_pci_device_suspend, + .resume = ata_pci_device_resume, };static int __init efar_init (void )
drivers/ata/pata_marvell.c +5 -1
@@ -20,7 +20,7 @@#include <linux/ata.h> #define DRV_NAME "pata_marvell" -#define DRV_VERSION "0.0.5u" +#define DRV_VERSION "0.1.1"/** * marvell_pre_reset - check for 40/80 pin
@@ -103,6 +103,8 @@ .slave_configure = ata_scsi_slave_config, /* Use standard CHS mapping rules */ .bios_param = ata_std_bios_param, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, };static const struct ata_port_operations marvell_ops = {
@@ -197,6 +199,8 @@ .id_table = marvell_pci_tbl, .probe = marvell_init_one, .remove = ata_pci_remove_one, + .suspend = ata_pci_device_suspend, + .resume = ata_pci_device_resume, };static int __init marvell_init (void )
drivers/ata/pata_mpiix.c +6 -2
@@ -35,7 +35,7 @@#include <linux/libata.h> #define DRV_NAME "pata_mpiix" -#define DRV_VERSION "0.7.2" +#define DRV_VERSION "0.7.3"enum {IDETIM =0x6C ,/* IDE control register */
@@ -167,6 +167,8 @@ .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, };static struct ata_port_operations mpiix_port_ops = {
@@ -284,7 +286,9 @@ .name = DRV_NAME, .id_table = mpiix, .probe = mpiix_init_one, - .remove = mpiix_remove_one + .remove = mpiix_remove_one, + .suspend = ata_pci_device_suspend, + .resume = ata_pci_device_resume, };static int __init mpiix_init (void )
drivers/ata/pata_netcell.c +5 -1
@@ -16,7 +16,7 @@#include <linux/ata.h> #define DRV_NAME "pata_netcell" -#define DRV_VERSION "0.1.5" +#define DRV_VERSION "0.1.6"/** * netcell_probe_init - check for 40/80 pin
@@ -64,6 +64,8 @@ .slave_configure = ata_scsi_slave_config, /* Use standard CHS mapping rules */ .bios_param = ata_std_bios_param, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, };static const struct ata_port_operations netcell_ops = {
@@ -152,6 +154,8 @@ .id_table = netcell_pci_tbl, .probe = netcell_init_one, .remove = ata_pci_remove_one, + .suspend = ata_pci_device_suspend, + .resume = ata_pci_device_resume, };static int __init netcell_init (void )
drivers/ata/pata_ns87410.c +6 -2
@@ -28,7 +28,7 @@#include <linux/libata.h> #define DRV_NAME "pata_ns87410" -#define DRV_VERSION "0.4.2" +#define DRV_VERSION "0.4.3"/** * ns87410_pre_reset - probe begin
@@ -157,6 +157,8 @@ .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, };static struct ata_port_operations ns87410_port_ops = {
@@ -209,7 +211,9 @@ .name = DRV_NAME, .id_table = ns87410, .probe = ns87410_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 ns87410_init (void )
drivers/ata/pata_oldpiix.c +4 -0
@@ -232,6 +232,8 @@ .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, };static const struct ata_port_operations oldpiix_pata_ops = {
@@ -313,6 +315,8 @@ .id_table = oldpiix_pci_tbl, .probe = oldpiix_init_one, .remove = ata_pci_remove_one, + .suspend = ata_pci_device_suspend, + .resume = ata_pci_device_resume, };static int __init oldpiix_init (void )
drivers/ata/pata_opti.c +6 -27
@@ -34,7 +34,7 @@#include <linux/libata.h> #define DRV_NAME "pata_opti" -#define DRV_VERSION "0.2.5" +#define DRV_VERSION "0.2.7"enum {READ_REG =0 ,/* index of Read cycle timing register */
@@ -109,30 +109,6 @@outb (0x83 , regio +2 ); } -#if 0 -/** -* opti_read_reg - control register read -* @ap: ATA port -* @reg: control register number -* -* The Opti uses magic 'trapdoor' register accesses to do configuration -* rather than using PCI space as other controllers do. The double inw -* on the error register activates configuration mode. We can then read -* the control register -*/ - -static u8 opti_read_reg (struct ata_port *ap,int reg) -{ -unsigned long regio = ap->ioaddr.cmd_addr; -u8 ret; -inw (regio +1 ); -inw (regio +1 ); -outb (3 , regio +2 ); - ret =inb (regio + reg); -outb (0x83 , regio +2 ); -} -#endif -/** * opti_set_piomode - set initial PIO mode data * @ap: ATA interface
@@ -203,12 +179,13 @@ .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, };static struct ata_port_operations opti_port_ops = { .port_disable = ata_port_disable, .set_piomode = opti_set_piomode, -/* .set_dmamode = opti_set_dmamode, */ .tf_load = ata_tf_load, .tf_read = ata_tf_read, .check_status = ata_check_status,
@@ -266,7 +243,9 @@ .name = DRV_NAME, .id_table = opti, .probe = opti_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 opti_init (void )
drivers/ata/pata_optidma.c +6 -2
@@ -33,7 +33,7 @@#include <linux/libata.h> #define DRV_NAME "pata_optidma" -#define DRV_VERSION "0.2.2" +#define DRV_VERSION "0.2.3"enum {READ_REG =0 ,/* index of Read cycle timing register */
@@ -360,6 +360,8 @@ .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, };static struct ata_port_operations optidma_port_ops = {
@@ -521,7 +523,9 @@ .name = DRV_NAME, .id_table = optidma, .probe = optidma_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 optidma_init (void )
drivers/ata/pata_radisys.c +4 -0
@@ -228,6 +228,8 @@ .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, };static const struct ata_port_operations radisys_pata_ops = {
@@ -310,6 +312,8 @@ .id_table = radisys_pci_tbl, .probe = radisys_init_one, .remove = ata_pci_remove_one, + .suspend = ata_pci_device_suspend, + .resume = ata_pci_device_resume, };static int __init radisys_init (void )
drivers/ata/pata_sc1200.c +6 -2
@@ -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
@@ -194,6 +194,8 @@ .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, };static struct ata_port_operations sc1200_port_ops = {
@@ -263,7 +265,9 @@ .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 )
drivers/ata/pata_triflex.c +6 -2
@@ -43,7 +43,7 @@#include <linux/libata.h> #define DRV_NAME "pata_triflex" -#define DRV_VERSION "0.2.5" +#define DRV_VERSION "0.2.7"/** * triflex_prereset - probe begin
@@ -193,6 +193,8 @@ .dma_boundary = ATA_DMA_BOUNDARY, .slave_configure = ata_scsi_slave_config, .bios_param = ata_std_bios_param, + .resume = ata_scsi_device_resume, + .suspend = ata_scsi_device_suspend, };static struct ata_port_operations triflex_port_ops = {
@@ -257,7 +259,9 @@ .name = DRV_NAME, .id_table = triflex, .probe = triflex_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 triflex_init (void )
Quoted 5 lines · Alan
This patch adds the suspend/resume callbacks for drivers which don't need any additional help (beyond the pci resume quirk patch I posted earlier anyway). Also bring version numbers back inline with master copies.
Signed-off-by Alan Cox <[email protected]>
applied this, and suspend/resume patches for
cmd64x
cs5520
cs5530
jmicron
rz1000
ali
sil680