lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[PATCH] SC1200 debug printk

Browse Source 
Kill a pair of long escaped debug printk calls

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
This commit is contained in:
Alan Cox
2006-06-28 04:27:00 -07:00
committed by Linus Torvalds
parent 19c1ef5f67
commit 2930d1bed7
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/ide/pci/sc1200.c
View File

@@ -395,7 +395,6 @@ static int sc1200_resume (struct pci_dev *dev)
{ {
ide_hwif_t *hwif = NULL; ide_hwif_t *hwif = NULL;
printk("SC1200: resume\n");
pci_set_power_state(dev, PCI_D0); // bring chip back from sleep state pci_set_power_state(dev, PCI_D0); // bring chip back from sleep state
dev->current_state = PM_EVENT_ON; dev->current_state = PM_EVENT_ON;
pci_enable_device(dev); pci_enable_device(dev);
@@ -405,7 +404,6 @@ printk("SC1200: resume\n");
while ((hwif = lookup_pci_dev(hwif, dev)) != NULL) { while ((hwif = lookup_pci_dev(hwif, dev)) != NULL) {
unsigned int basereg, r, d, format; unsigned int basereg, r, d, format;
sc1200_saved_state_t *ss = (sc1200_saved_state_t *)hwif->config_data; sc1200_saved_state_t *ss = (sc1200_saved_state_t *)hwif->config_data;
printk("%s: SC1200: resume\n", hwif->name);
// //
// Restore timing registers: this may be unnecessary if BIOS also does it // Restore timing registers: this may be unnecessary if BIOS also does it
@@ -493,7 +491,7 @@ static int __devinit sc1200_init_one(struct pci_dev *dev, const struct pci_devic
} }
static struct pci_device_id sc1200_pci_tbl[] = { static struct pci_device_id sc1200_pci_tbl[] = {
{ PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_IDE, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, { PCI_DEVICE(PCI_VENDOR_ID_NS, PCI_DEVICE_ID_NS_SCx200_IDE), 0},
{ 0, }, { 0, },
}; };
MODULE_DEVICE_TABLE(pci, sc1200_pci_tbl); MODULE_DEVICE_TABLE(pci, sc1200_pci_tbl);