Skip to content

Commit

Permalink
pcie: fix warnings when CONFIG_PM=n
Browse files Browse the repository at this point in the history
Signed-off-by: Henrik Kretzschmar <henne@nachtwindheim.de>
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
  • Loading branch information
Henrik Kretzschmar authored and Greg Kroah-Hartman committed Aug 3, 2006
1 parent fd60ae4 commit 6085483
Showing 1 changed file with 17 additions and 17 deletions.
34 changes: 17 additions & 17 deletions drivers/pci/pcie/portdrv_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,23 +30,6 @@ MODULE_LICENSE("GPL");
/* global data */
static const char device_name[] = "pcieport-driver";

static int pcie_portdrv_save_config(struct pci_dev *dev)
{
return pci_save_state(dev);
}

static int pcie_portdrv_restore_config(struct pci_dev *dev)
{
int retval;

pci_restore_state(dev);
retval = pci_enable_device(dev);
if (retval)
return retval;
pci_set_master(dev);
return 0;
}

/*
* pcie_portdrv_probe - Probe PCI-Express port devices
* @dev: PCI-Express port device being probed
Expand Down Expand Up @@ -86,6 +69,23 @@ static void pcie_portdrv_remove (struct pci_dev *dev)
}

#ifdef CONFIG_PM
static int pcie_portdrv_save_config(struct pci_dev *dev)
{
return pci_save_state(dev);
}

static int pcie_portdrv_restore_config(struct pci_dev *dev)
{
int retval;

pci_restore_state(dev);
retval = pci_enable_device(dev);
if (retval)
return retval;
pci_set_master(dev);
return 0;
}

static int pcie_portdrv_suspend (struct pci_dev *dev, pm_message_t state)
{
int ret = pcie_port_device_suspend(dev, state);
Expand Down

0 comments on commit 6085483

Please sign in to comment.