leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] CONFIG_PM=n slim: drivers/pcmcia/*

Browse Source 
Remove some code which is unneeded if CONFIG_PM=n.

Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
This commit is contained in:
Alexey Dobriyan 2006-10-20 14:44:13 -07:00 committed by Dominik Brodowski
parent ace7d4772c
commit f237de58b1
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pcmcia/i82092.c
View File

@ -41,6 +41,7 @@ static struct pci_device_id i82092aa_pci_ids[] = {
}; };
MODULE_DEVICE_TABLE(pci, i82092aa_pci_ids); MODULE_DEVICE_TABLE(pci, i82092aa_pci_ids);
#ifdef CONFIG_PM
static int i82092aa_socket_suspend (struct pci_dev *dev, pm_message_t state) static int i82092aa_socket_suspend (struct pci_dev *dev, pm_message_t state)
{ {
return pcmcia_socket_dev_suspend(&dev->dev, state); return pcmcia_socket_dev_suspend(&dev->dev, state);
@ -50,14 +51,17 @@ static int i82092aa_socket_resume (struct pci_dev *dev)
{ {
return pcmcia_socket_dev_resume(&dev->dev); return pcmcia_socket_dev_resume(&dev->dev);
} }
#endif
static struct pci_driver i82092aa_pci_drv = { static struct pci_driver i82092aa_pci_drv = {
.name = "i82092aa", .name = "i82092aa",
.id_table = i82092aa_pci_ids, .id_table = i82092aa_pci_ids,
.probe = i82092aa_pci_probe, .probe = i82092aa_pci_probe,
.remove = __devexit_p(i82092aa_pci_remove), .remove = __devexit_p(i82092aa_pci_remove),
#ifdef CONFIG_PM
.suspend = i82092aa_socket_suspend, .suspend = i82092aa_socket_suspend,
.resume = i82092aa_socket_resume, .resume = i82092aa_socket_resume,
#endif
}; };

4
drivers/pcmcia/pd6729.c
View File

@ -755,6 +755,7 @@ static void __devexit pd6729_pci_remove(struct pci_dev *dev)
kfree(socket); kfree(socket);
} }
#ifdef CONFIG_PM
static int pd6729_socket_suspend(struct pci_dev *dev, pm_message_t state) static int pd6729_socket_suspend(struct pci_dev *dev, pm_message_t state)
{ {
return pcmcia_socket_dev_suspend(&dev->dev, state); return pcmcia_socket_dev_suspend(&dev->dev, state);
@ -764,6 +765,7 @@ static int pd6729_socket_resume(struct pci_dev *dev)
{ {
return pcmcia_socket_dev_resume(&dev->dev); return pcmcia_socket_dev_resume(&dev->dev);
} }
#endif
static struct pci_device_id pd6729_pci_ids[] = { static struct pci_device_id pd6729_pci_ids[] = {
{ {
@ -781,8 +783,10 @@ static struct pci_driver pd6729_pci_drv = {
.id_table = pd6729_pci_ids, .id_table = pd6729_pci_ids,
.probe = pd6729_pci_probe, .probe = pd6729_pci_probe,
.remove = __devexit_p(pd6729_pci_remove), .remove = __devexit_p(pd6729_pci_remove),
#ifdef CONFIG_PM
.suspend = pd6729_socket_suspend, .suspend = pd6729_socket_suspend,
.resume = pd6729_socket_resume, .resume = pd6729_socket_resume,
#endif
}; };
static int pd6729_module_init(void) static int pd6729_module_init(void)

6
drivers/pcmcia/yenta_socket.c
View File

@ -1213,7 +1213,7 @@ static int __devinit yenta_probe (struct pci_dev *dev, const struct pci_device_i
return ret; return ret;
} }
#ifdef CONFIG_PM
static int yenta_dev_suspend (struct pci_dev *dev, pm_message_t state) static int yenta_dev_suspend (struct pci_dev *dev, pm_message_t state)
{ {
struct yenta_socket *socket = pci_get_drvdata(dev); struct yenta_socket *socket = pci_get_drvdata(dev);
@ -1262,7 +1262,7 @@ static int yenta_dev_resume (struct pci_dev *dev)
return pcmcia_socket_dev_resume(&dev->dev); return pcmcia_socket_dev_resume(&dev->dev);
} }
#endif
#define CB_ID(vend,dev,type) \ #define CB_ID(vend,dev,type) \
{ \ { \
@ -1359,8 +1359,10 @@ static struct pci_driver yenta_cardbus_driver = {
.id_table = yenta_table, .id_table = yenta_table,
.probe = yenta_probe, .probe = yenta_probe,
.remove = __devexit_p(yenta_close), .remove = __devexit_p(yenta_close),
#ifdef CONFIG_PM
.suspend = yenta_dev_suspend, .suspend = yenta_dev_suspend,
.resume = yenta_dev_resume, .resume = yenta_dev_resume,
#endif
}; };