Skip to contentSkip to conversation

sata_via: add missing PM hooks

PATCH Applied Tejun Heo 4 participants 5 messages May 4, 2007 – May 17, 2007 libata

lore
Share & tools
lore

Tejun Heo

author
#0 lore raw

PATCH 1/1 sata_via: add missing PM hooks

For some reason, sata_via is missing PM hooks. Add them. Spotted by Jeroen Janssen <[email protected]>.

Cc Jeroen Janssen <[email protected]>

---
I have no idea how we missed this. This is for both libata-dev && -stable. Thanks.

drivers/ata/sata_via.c +8 -0
Index: tree0/drivers/ata/sata_via.c
===================================================================
@@ -97,6 +97,10 @@ static struct pci_driver svia_pci_driver
 	.name			= DRV_NAME,
 	.id_table		= svia_pci_tbl,
 	.probe			= svia_init_one,
+#ifdef CONFIG_PM
+	.suspend		= ata_pci_device_suspend,
+	.resume			= ata_pci_device_resume,
+#endif
 	.remove			= ata_pci_remove_one,
 };
 
@@ -116,6 +120,10 @@ static struct scsi_host_template svia_sh
 	.slave_configure	= ata_scsi_slave_config,
 	.slave_destroy		= ata_scsi_slave_destroy,
 	.bios_param		= ata_std_bios_param,
+#ifdef CONFIG_PM
+	.suspend		= ata_scsi_device_suspend,
+	.resume			= ata_scsi_device_resume,
+#endif
 };
 
 static const struct ata_port_operations vt6420_sata_ops = {
#1 lore raw

Hi,

Any idea how I can track that this has been picked up/applied (I looked at some of the git repositories on kernel.org, but as far as I can tell, this patch is not in yet).

Best regards,

Jeroen Janssen

Quoted 36 lines · Tejun Heo

For some reason, sata_via is missing PM hooks. Add them. Spotted by Jeroen Janssen <[email protected]>.

Cc Jeroen Janssen <[email protected]>

---
I have no idea how we missed this. This is for both libata-dev && -stable. Thanks.

Index: tree0/drivers/ata/sata_via.c
===================================================================

drivers/ata/sata_via.c +8 -0
@@ -97,6 +97,10 @@ static struct pci_driver svia_pci_driver
        .name                   = DRV_NAME,
        .id_table               = svia_pci_tbl,
        .probe                  = svia_init_one,
+#ifdef CONFIG_PM
+       .suspend                = ata_pci_device_suspend,
+       .resume                 = ata_pci_device_resume,
+#endif
        .remove                 = ata_pci_remove_one,
 };
 
@@ -116,6 +120,10 @@ static struct scsi_host_template svia_sh
        .slave_configure        = ata_scsi_slave_config,
        .slave_destroy          = ata_scsi_slave_destroy,
        .bios_param             = ata_std_bios_param,
+#ifdef CONFIG_PM
+       .suspend                = ata_scsi_device_suspend,
+       .resume                 = ata_scsi_device_resume,
+#endif
 };
 
 static const struct ata_port_operations vt6420_sata_ops = {
author
#2 lore raw
Quoted 5 lines · Jeroen Janssen

Hi,

Any idea how I can track that this has been picked up/applied (I looked at some of the git repositories on kernel.org, but as far as I can tell, this patch is not in yet).

It's still pending. What usually happens is Jeff replying with the body saying 'applied' and the patch gets into libata-dev#upstream or #upstream-fixes and then merged into Linus's tree. For stable release, after Jeff acks it, Greg or any other stable team member picks it up and writes a formatted mail about it to everyone on the S-O-B: or Cc: list and stable mailing list. So, nope, it hasn't happend yet but you'll get a notice when it happens.

Signature · 1 line
tejun
#4 lore raw

patch sata_via-add-missing-pm-hooks.patch queued to 2.6.21-stable tree

In reply to Tejun Heo

This is a note to let you know that we have just queued up the patch titled

Subject: sata_via: add missing PM hooks

to the 2.6.21-stable tree. Its filename is

sata_via-add-missing-pm-hooks.patch

A git repo of this tree can be found at
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

Quoted 1 line

From [email protected] Fri May 4 06:32:42 2007

Message-ID: <[email protected]>
Date: Fri, 04 May 2007 15:30:34 +0200
From: Tejun Heo <[email protected]>
To: Jeff Garzik <[email protected]>, IDE/ATA development list <[email protected]>, [email protected]
Cc: Jeroen Janssen <[email protected]>
Subject: sata_via: add missing PM hooks

For some reason, sata_via is missing PM hooks. Add them. Spotted by Jeroen Janssen <[email protected]>.

---
 drivers/ata/sata_via.c |    8 ++++++++
 1 file changed, 8 insertions(+)
drivers/ata/sata_via.c +8 -0
@@ -97,6 +97,10 @@ static struct pci_driver svia_pci_driver
 	.name			= DRV_NAME,
 	.id_table		= svia_pci_tbl,
 	.probe			= svia_init_one,
+#ifdef CONFIG_PM
+	.suspend		= ata_pci_device_suspend,
+	.resume			= ata_pci_device_resume,
+#endif
 	.remove			= ata_pci_remove_one,
 };
 
@@ -116,6 +120,10 @@ static struct scsi_host_template svia_sh
 	.slave_configure	= ata_scsi_slave_config,
 	.slave_destroy		= ata_scsi_slave_destroy,
 	.bios_param		= ata_std_bios_param,
+#ifdef CONFIG_PM
+	.suspend		= ata_scsi_device_suspend,
+	.resume			= ata_scsi_device_resume,
+#endif
 };
 
 static const struct ata_port_operations vt6420_sata_ops = {

Patches currently in stable-queue which might be from [email protected] are

queue-2.6.21/driver-core-don-t-free-devt_attr-till-the-device-is-released.patch queue-2.6.21/libata-sff-undo-bug-introduced-with-pci_iomap-changes.patch queue-2.6.21/pci-quirks-disable-msi-on-rs400-200-and-rs480.patch queue-2.6.21/sata_via-add-missing-pm-hooks.patch