Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30ced0f0 authored by Alan Cox's avatar Alan Cox Committed by Jeff Garzik
Browse files

[PATCH] 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: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 8550c163

drivers/ata/ata_generic.c

+6 −2
Original line number Diff line number Diff line
@@ -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
@@ -118,6 +118,8 @@ static struct scsi_host_template generic_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 generic_port_ops = {
@@ -226,7 +228,9 @@ static struct pci_driver ata_generic_pci_driver = { 
	.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
Original line number Diff line number Diff line
@@ -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,
@@ -218,6 +218,8 @@ static struct scsi_host_template atiixp_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 atiixp_port_ops = {
@@ -281,7 +283,9 @@ static struct pci_driver atiixp_pci_driver = { 
	.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
Original line number Diff line number Diff line
@@ -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
@@ -186,6 +186,8 @@ static struct scsi_host_template cs5535_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 cs5535_port_ops = {
@@ -269,6 +271,8 @@ static struct pci_driver cs5535_pci_driver = { 
	.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
Original line number Diff line number Diff line
@@ -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 */
@@ -137,6 +137,8 @@ static struct scsi_host_template cy82c693_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 cy82c693_port_ops = {
@@ -204,7 +206,9 @@ static struct pci_driver cy82c693_pci_driver = { 
	.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
Original line number Diff line number Diff line
@@ -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
@@ -235,6 +235,8 @@ static struct scsi_host_template efar_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 const struct ata_port_operations efar_ops = {
@@ -316,6 +318,8 @@ static struct pci_driver efar_pci_driver = { 
	.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)