Commit 1d5e7996 authored by Alexey Dobriyan's avatar Alexey Dobriyan Committed by Russell King

[SERIAL] CONFIG_PM=n slim: drivers/serial/8250_pci.c

Remove some code which is unneeded if CONFIG_PM=n.
Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 255341c6
...@@ -1789,6 +1789,7 @@ static void __devexit pciserial_remove_one(struct pci_dev *dev) ...@@ -1789,6 +1789,7 @@ static void __devexit pciserial_remove_one(struct pci_dev *dev)
pci_disable_device(dev); pci_disable_device(dev);
} }
#ifdef CONFIG_PM
static int pciserial_suspend_one(struct pci_dev *dev, pm_message_t state) static int pciserial_suspend_one(struct pci_dev *dev, pm_message_t state)
{ {
struct serial_private *priv = pci_get_drvdata(dev); struct serial_private *priv = pci_get_drvdata(dev);
...@@ -1818,6 +1819,7 @@ static int pciserial_resume_one(struct pci_dev *dev) ...@@ -1818,6 +1819,7 @@ static int pciserial_resume_one(struct pci_dev *dev)
} }
return 0; return 0;
} }
#endif
static struct pci_device_id serial_pci_tbl[] = { static struct pci_device_id serial_pci_tbl[] = {
{ PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V960, { PCI_VENDOR_ID_V3, PCI_DEVICE_ID_V3_V960,
...@@ -2375,8 +2377,10 @@ static struct pci_driver serial_pci_driver = { ...@@ -2375,8 +2377,10 @@ static struct pci_driver serial_pci_driver = {
.name = "serial", .name = "serial",
.probe = pciserial_init_one, .probe = pciserial_init_one,
.remove = __devexit_p(pciserial_remove_one), .remove = __devexit_p(pciserial_remove_one),
#ifdef CONFIG_PM
.suspend = pciserial_suspend_one, .suspend = pciserial_suspend_one,
.resume = pciserial_resume_one, .resume = pciserial_resume_one,
#endif
.id_table = serial_pci_tbl, .id_table = serial_pci_tbl,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment