Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 15856ad5 authored by Bill Pemberton's avatar Bill Pemberton Committed by Greg Kroah-Hartman
Browse files

PCI: Remove __dev* markings 



CONFIG_HOTPLUG is going away as an option so __devexit_p, __devint,
__devinitdata, __devinitconst, and _devexit are no longer needed.

Signed-off-by: default avatarBill Pemberton <wfp5p@virginia.edu>
Acked-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7dc30303

drivers/pci/hotplug/cpcihp_zt5550.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -271,7 +271,7 @@ init_hc_error: 




}

}





static void __devexit zt5550_hc_remove_one(struct pci_dev *pdev)

static void zt5550_hc_remove_one(struct pci_dev *pdev)

{

{

	cpci_hp_stop();

	cpci_hp_stop();

	cpci_hp_unregister_bus(bus0);

	cpci_hp_unregister_bus(bus0);
@@ -290,7 +290,7 @@ static struct pci_driver zt5550_hc_driver = { 
	.name		= "zt5550_hc",

	.name		= "zt5550_hc",

	.id_table	= zt5550_hc_pci_tbl,

	.id_table	= zt5550_hc_pci_tbl,

	.probe		= zt5550_hc_init_one,

	.probe		= zt5550_hc_init_one,

	.remove		= __devexit_p(zt5550_hc_remove_one),

	.remove		= zt5550_hc_remove_one,

};

};





static int __init zt5550_init(void)

static int __init zt5550_init(void)

drivers/pci/ioapic.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -27,7 +27,7 @@ struct ioapic { 
	u32		gsi_base;

	u32		gsi_base;

};

};





static int __devinit ioapic_probe(struct pci_dev *dev, const struct pci_device_id *ent)

static int ioapic_probe(struct pci_dev *dev, const struct pci_device_id *ent)

{

{

	acpi_handle handle;

	acpi_handle handle;

	acpi_status status;

	acpi_status status;
@@ -88,7 +88,7 @@ exit_free: 
	return -ENODEV;

	return -ENODEV;

}

}





static void __devexit ioapic_remove(struct pci_dev *dev)

static void ioapic_remove(struct pci_dev *dev)

{

{

	struct ioapic *ioapic = pci_get_drvdata(dev);

	struct ioapic *ioapic = pci_get_drvdata(dev);
@@ -110,7 +110,7 @@ static struct pci_driver ioapic_driver = { 
	.name		= "ioapic",

	.name		= "ioapic",

	.id_table	= ioapic_devices,

	.id_table	= ioapic_devices,

	.probe		= ioapic_probe,

	.probe		= ioapic_probe,

	.remove		= __devexit_p(ioapic_remove),

	.remove		= ioapic_remove,

};

};





static int __init ioapic_init(void)

static int __init ioapic_init(void)

drivers/pci/pci.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -86,7 +86,7 @@ enum pcie_bus_config_types pcie_bus_config = PCIE_BUS_TUNE_OFF; 
 * the dfl or actual value as it sees fit.  Don't forget this is

 * the dfl or actual value as it sees fit.  Don't forget this is

 * measured in 32-bit words, not bytes.

 * measured in 32-bit words, not bytes.

 */

 */

u8 pci_dfl_cache_line_size __devinitdata = L1_CACHE_BYTES >> 2;

u8 pci_dfl_cache_line_size = L1_CACHE_BYTES >> 2;

u8 pci_cache_line_size;

u8 pci_cache_line_size;





/*

/*
@@ -3857,7 +3857,7 @@ static int __init pci_resource_alignment_sysfs_init(void) 




late_initcall(pci_resource_alignment_sysfs_init);

late_initcall(pci_resource_alignment_sysfs_init);





static void __devinit pci_no_domains(void)

static void pci_no_domains(void)

{

{

#ifdef CONFIG_PCI_DOMAINS

#ifdef CONFIG_PCI_DOMAINS

	pci_domains_supported = 0;

	pci_domains_supported = 0;

drivers/pci/pcie/aer/aerdrv.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ MODULE_AUTHOR(DRIVER_AUTHOR); 
MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_DESCRIPTION(DRIVER_DESC);

MODULE_LICENSE("GPL");

MODULE_LICENSE("GPL");





static int __devinit aer_probe(struct pcie_device *dev);

static int aer_probe(struct pcie_device *dev);

static void aer_remove(struct pcie_device *dev);

static void aer_remove(struct pcie_device *dev);

static pci_ers_result_t aer_error_detected(struct pci_dev *dev,

static pci_ers_result_t aer_error_detected(struct pci_dev *dev,

	enum pci_channel_state error);

	enum pci_channel_state error);
@@ -300,7 +300,7 @@ static void aer_remove(struct pcie_device *dev) 
 *

 *

 * Invoked when PCI Express bus loads AER service driver.

 * Invoked when PCI Express bus loads AER service driver.

 */

 */

static int __devinit aer_probe(struct pcie_device *dev)

static int aer_probe(struct pcie_device *dev)

{

{

	int status;

	int status;

	struct aer_rpc *rpc;

	struct aer_rpc *rpc;

drivers/pci/pcie/portdrv_pci.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -182,7 +182,7 @@ static const struct pci_device_id port_runtime_pm_black_list[] = { 
 * this port device.

 * this port device.

 *

 *

 */

 */

static int __devinit pcie_portdrv_probe(struct pci_dev *dev,

static int pcie_portdrv_probe(struct pci_dev *dev,

					const struct pci_device_id *id)

					const struct pci_device_id *id)

{

{

	int status;

	int status;