Commit 446cc1c5 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/legacy-pm-removal' 

- Convert amd64-agp, sis-agp, via-agp from legacy PCI power management to
  generic power management (Vaibhav Gupta)

* pci/legacy-pm-removal:
  via-agp: convert to generic power management
  sis-agp: convert to generic power management
  amd64-agp: convert to generic power management
parents 7475f931 0aeddbd0

drivers/char/agp/amd64-agp.c

+6 −18
Original line number Diff line number Diff line
@@ -588,20 +588,11 @@ static void agp_amd64_remove(struct pci_dev *pdev) 
	agp_bridges_found--;

}



#ifdef CONFIG_PM

#define agp_amd64_suspend NULL



static int agp_amd64_suspend(struct pci_dev *pdev, pm_message_t state)

static int __maybe_unused agp_amd64_resume(struct device *dev)

{

	pci_save_state(pdev);

	pci_set_power_state(pdev, pci_choose_state(pdev, state));



	return 0;

}



static int agp_amd64_resume(struct pci_dev *pdev)

{

	pci_set_power_state(pdev, PCI_D0);

	pci_restore_state(pdev);

	struct pci_dev *pdev = to_pci_dev(dev);



	if (pdev->vendor == PCI_VENDOR_ID_NVIDIA)

		nforce3_agp_init(pdev);
@@ -609,8 +600,6 @@ static int agp_amd64_resume(struct pci_dev *pdev) 
	return amd_8151_configure();

}



#endif /* CONFIG_PM */



static const struct pci_device_id agp_amd64_pci_table[] = {

	{

	.class		= (PCI_CLASS_BRIDGE_HOST << 8),
@@ -738,15 +727,14 @@ static const struct pci_device_id agp_amd64_pci_promisc_table[] = { 
	{ }

};



static SIMPLE_DEV_PM_OPS(agp_amd64_pm_ops, agp_amd64_suspend, agp_amd64_resume);



static struct pci_driver agp_amd64_pci_driver = {

	.name		= "agpgart-amd64",

	.id_table	= agp_amd64_pci_table,

	.probe		= agp_amd64_probe,

	.remove		= agp_amd64_remove,

#ifdef CONFIG_PM

	.suspend	= agp_amd64_suspend,

	.resume		= agp_amd64_resume,

#endif

	.driver.pm  = &agp_amd64_pm_ops,

};

drivers/char/agp/sis-agp.c

+6 −19
Original line number Diff line number Diff line
@@ -217,26 +217,14 @@ static void agp_sis_remove(struct pci_dev *pdev) 
	agp_put_bridge(bridge);

}



#ifdef CONFIG_PM

#define agp_sis_suspend NULL



static int agp_sis_suspend(struct pci_dev *pdev, pm_message_t state)

static int __maybe_unused agp_sis_resume(

	__attribute__((unused)) struct device *dev)

{

	pci_save_state(pdev);

	pci_set_power_state(pdev, pci_choose_state(pdev, state));



	return 0;

}



static int agp_sis_resume(struct pci_dev *pdev)

{

	pci_set_power_state(pdev, PCI_D0);

	pci_restore_state(pdev);



	return sis_driver.configure();

}



#endif /* CONFIG_PM */



static const struct pci_device_id agp_sis_pci_table[] = {

	{

		.class		= (PCI_CLASS_BRIDGE_HOST << 8),
@@ -419,15 +407,14 @@ static const struct pci_device_id agp_sis_pci_table[] = { 


MODULE_DEVICE_TABLE(pci, agp_sis_pci_table);



static SIMPLE_DEV_PM_OPS(agp_sis_pm_ops, agp_sis_suspend, agp_sis_resume);



static struct pci_driver agp_sis_pci_driver = {

	.name		= "agpgart-sis",

	.id_table	= agp_sis_pci_table,

	.probe		= agp_sis_probe,

	.remove		= agp_sis_remove,

#ifdef CONFIG_PM

	.suspend	= agp_sis_suspend,

	.resume		= agp_sis_resume,

#endif

	.driver.pm      = &agp_sis_pm_ops,

};



static int __init agp_sis_init(void)

drivers/char/agp/via-agp.c

+5 −20
Original line number Diff line number Diff line
@@ -492,22 +492,11 @@ static void agp_via_remove(struct pci_dev *pdev) 
	agp_put_bridge(bridge);

}



#ifdef CONFIG_PM

#define agp_via_suspend NULL



static int agp_via_suspend(struct pci_dev *pdev, pm_message_t state)

static int __maybe_unused agp_via_resume(struct device *dev)

{

	pci_save_state (pdev);

	pci_set_power_state (pdev, PCI_D3hot);



	return 0;

}



static int agp_via_resume(struct pci_dev *pdev)

{

	struct agp_bridge_data *bridge = pci_get_drvdata(pdev);



	pci_set_power_state (pdev, PCI_D0);

	pci_restore_state(pdev);

	struct agp_bridge_data *bridge = dev_get_drvdata(dev);



	if (bridge->driver == &via_agp3_driver)

		return via_configure_agp3();
@@ -517,8 +506,6 @@ static int agp_via_resume(struct pci_dev *pdev) 
	return 0;

}



#endif /* CONFIG_PM */



/* must be the same order as name table above */

static const struct pci_device_id agp_via_pci_table[] = {

#define ID(x) \
@@ -567,16 +554,14 @@ static const struct pci_device_id agp_via_pci_table[] = { 


MODULE_DEVICE_TABLE(pci, agp_via_pci_table);



static SIMPLE_DEV_PM_OPS(agp_via_pm_ops, agp_via_suspend, agp_via_resume);



static struct pci_driver agp_via_pci_driver = {

	.name		= "agpgart-via",

	.id_table	= agp_via_pci_table,

	.probe		= agp_via_probe,

	.remove		= agp_via_remove,

#ifdef CONFIG_PM

	.suspend	= agp_via_suspend,

	.resume		= agp_via_resume,

#endif

	.driver.pm      = &agp_via_pm_ops,

};