Commit 924b08f3 authored by Hidetoshi Seto's avatar Hidetoshi Seto Committed by Greg Kroah-Hartman
Browse files

PCI : remove too specialized __pci_enable_device for default resume 



Original patch was posted as "PCI : Move pci_fixup_device and is_enabled".
This 1 of 3 patches does:

  - reverts small part of Inaky's patch
    (remove __pci_enable_device)
    This change will be recovered by 3rd patch.

  - temporarily remove pci_fixup_device.
    This change will be recovered by 2nd patch.

Signed-off-by: default avatarKenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: default avatarHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Cc: Inaky Perez-Gonzalez <inaky@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 07eddf3d

drivers/pci/pci-driver.c

+1 −1
Original line number Diff line number Diff line
@@ -325,7 +325,7 @@ static int pci_default_resume(struct pci_dev *pci_dev) 
	pci_restore_state(pci_dev);

	/* if the device was enabled before suspend, reenable */

	if (atomic_read(&pci_dev->enable_cnt))

		retval = __pci_enable_device(pci_dev);

		retval = pci_enable_device(pci_dev);

	/* if the device was busmaster before the suspend, make it busmaster again */

	if (pci_dev->is_busmaster)

		pci_set_master(pci_dev);

drivers/pci/pci.c

+0 −23
Original line number Diff line number Diff line
@@ -700,29 +700,6 @@ pci_enable_device_bars(struct pci_dev *dev, int bars) 
	return 0;

}



/**

 * __pci_enable_device - Initialize device before it's used by a driver.

 * @dev: PCI device to be initialized

 *

 *  Initialize device before it's used by a driver. Ask low-level code

 *  to enable I/O and memory. Wake up the device if it was suspended.

 *  Beware, this function can fail.

 *

 * Note this function is a backend and is not supposed to be called by

 * normal code, use pci_enable_device() instead.

 */

int

__pci_enable_device(struct pci_dev *dev)

{

	int err;



	err = pci_enable_device_bars(dev, (1 << PCI_NUM_RESOURCES) - 1);

	if (err)

		return err;

	pci_fixup_device(pci_fixup_enable, dev);

	return 0;

}



/**

 * pci_enable_device - Initialize device before it's used by a driver.

 * @dev: PCI device to be initialized

drivers/pci/pci.h

+0 −1
Original line number Diff line number Diff line 
/* Functions internal to the PCI core code */



extern int __must_check __pci_enable_device(struct pci_dev *);

extern int pci_uevent(struct device *dev, char **envp, int num_envp,

		      char *buffer, int buffer_size);

extern int pci_create_sysfs_dev_files(struct pci_dev *pdev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE