]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] SC1200 debug printk
authorAlan Cox <alan@lxorguk.ukuu.org.uk>
Wed, 28 Jun 2006 11:27:00 +0000 (04:27 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 28 Jun 2006 21:59:06 +0000 (14:59 -0700)
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>
drivers/ide/pci/sc1200.c

index 24e21b2838c15028bd4f72c4a2305ddf0b7b54a3..778b82ae964de770e81acef1c00eb18e20f5f8b6 100644 (file)
@@ -395,7 +395,6 @@ static int sc1200_resume (struct pci_dev *dev)
 {
        ide_hwif_t      *hwif = NULL;
 
-printk("SC1200: resume\n");
        pci_set_power_state(dev, PCI_D0);       // bring chip back from sleep state
        dev->current_state = PM_EVENT_ON;
        pci_enable_device(dev);
@@ -405,7 +404,6 @@ printk("SC1200: resume\n");
        while ((hwif = lookup_pci_dev(hwif, dev)) != NULL) {
                unsigned int            basereg, r, d, format;
                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
@@ -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[] = {
-       { 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, },
 };
 MODULE_DEVICE_TABLE(pci, sc1200_pci_tbl);