Skip to content

Commit

Permalink
PCI: Remove __dev* markings
Browse files Browse the repository at this point in the history 
CONFIG_HOTPLUG is going away as an option so __devexit_p, __devint,
__devinitdata, __devinitconst, and _devexit are no longer needed.

Signed-off-by: Bill Pemberton <wfp5p@virginia.edu>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Bill Pemberton authored and Greg Kroah-Hartman committed Nov 28, 2012
1 parent 7dc3030 commit 15856ad
Show file tree
Hide file tree
Showing 9 changed files with 93 additions and 93 deletions.
4 changes: 2 additions & 2 deletions drivers/pci/hotplug/cpcihp_zt5550.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ static int zt5550_hc_init_one (struct pci_dev *pdev, const struct pci_device_id

}

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_unregister_bus(bus0);
Expand All @@ -290,7 +290,7 @@ static struct pci_driver zt5550_hc_driver = {
.name = "zt5550_hc",
.id_table = zt5550_hc_pci_tbl,
.probe = zt5550_hc_init_one,
.remove = __devexit_p(zt5550_hc_remove_one),
.remove = zt5550_hc_remove_one,
};

static int __init zt5550_init(void)
Expand Down
6 changes: 3 additions & 3 deletions drivers/pci/ioapic.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ struct ioapic {
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_status status;
Expand Down Expand Up @@ -88,7 +88,7 @@ static int __devinit ioapic_probe(struct pci_dev *dev, const struct pci_device_i
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);

Expand All @@ -110,7 +110,7 @@ static struct pci_driver ioapic_driver = {
.name = "ioapic",
.id_table = ioapic_devices,
.probe = ioapic_probe,
.remove = __devexit_p(ioapic_remove),
.remove = ioapic_remove,
};

static int __init ioapic_init(void)
Expand Down
4 changes: 2 additions & 2 deletions drivers/pci/pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
* 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;

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

late_initcall(pci_resource_alignment_sysfs_init);

static void __devinit pci_no_domains(void)
static void pci_no_domains(void)
{
#ifdef CONFIG_PCI_DOMAINS
pci_domains_supported = 0;
Expand Down
4 changes: 2 additions & 2 deletions drivers/pci/pcie/aer/aerdrv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
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 pci_ers_result_t aer_error_detected(struct pci_dev *dev,
enum pci_channel_state error);
Expand Down Expand Up @@ -300,7 +300,7 @@ static void aer_remove(struct pcie_device *dev)
*
* 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;
struct aer_rpc *rpc;
Expand Down
2 changes: 1 addition & 1 deletion drivers/pci/pcie/portdrv_pci.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ static const struct pci_device_id port_runtime_pm_black_list[] = {
* 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)
{
int status;
Expand Down
18 changes: 9 additions & 9 deletions drivers/pci/probe.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -305,7 +305,7 @@ static void pci_read_bases(struct pci_dev *dev, unsigned int howmany, int rom)
}
}

static void __devinit pci_read_bridge_io(struct pci_bus *child)
static void pci_read_bridge_io(struct pci_bus *child)
{
struct pci_dev *dev = child->self;
u8 io_base_lo, io_limit_lo;
Expand Down Expand Up @@ -345,7 +345,7 @@ static void __devinit pci_read_bridge_io(struct pci_bus *child)
}
}

static void __devinit pci_read_bridge_mmio(struct pci_bus *child)
static void pci_read_bridge_mmio(struct pci_bus *child)
{
struct pci_dev *dev = child->self;
u16 mem_base_lo, mem_limit_lo;
Expand All @@ -367,7 +367,7 @@ static void __devinit pci_read_bridge_mmio(struct pci_bus *child)
}
}

static void __devinit pci_read_bridge_mmio_pref(struct pci_bus *child)
static void pci_read_bridge_mmio_pref(struct pci_bus *child)
{
struct pci_dev *dev = child->self;
u16 mem_base_lo, mem_limit_lo;
Expand Down Expand Up @@ -417,7 +417,7 @@ static void __devinit pci_read_bridge_mmio_pref(struct pci_bus *child)
}
}

void __devinit pci_read_bridge_bases(struct pci_bus *child)
void pci_read_bridge_bases(struct pci_bus *child)
{
struct pci_dev *dev = child->self;
struct resource *res;
Expand Down Expand Up @@ -705,7 +705,7 @@ static void pci_fixup_parent_subordinate_busnr(struct pci_bus *child, int max)
* them, we proceed to assigning numbers to the remaining buses in
* order to avoid overlaps between old and new bus numbers.
*/
int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass)
int pci_scan_bridge(struct pci_bus *bus, struct pci_dev *dev, int max, int pass)
{
struct pci_bus *child;
int is_cardbus = (dev->hdr_type == PCI_HEADER_TYPE_CARDBUS);
Expand Down Expand Up @@ -1586,7 +1586,7 @@ void pcie_bus_configure_settings(struct pci_bus *bus, u8 mpss)
}
EXPORT_SYMBOL_GPL(pcie_bus_configure_settings);

unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus)
unsigned int pci_scan_child_bus(struct pci_bus *bus)
{
unsigned int devfn, pass, max = bus->busn_res.start;
struct pci_dev *dev;
Expand Down Expand Up @@ -1790,7 +1790,7 @@ void pci_bus_release_busn_res(struct pci_bus *b)
res, ret ? "can not be" : "is");
}

struct pci_bus * __devinit pci_scan_root_bus(struct device *parent, int bus,
struct pci_bus *pci_scan_root_bus(struct device *parent, int bus,
struct pci_ops *ops, void *sysdata, struct list_head *resources)
{
struct pci_host_bridge_window *window;
Expand Down Expand Up @@ -1826,7 +1826,7 @@ struct pci_bus * __devinit pci_scan_root_bus(struct device *parent, int bus,
EXPORT_SYMBOL(pci_scan_root_bus);

/* Deprecated; use pci_scan_root_bus() instead */
struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent,
struct pci_bus *pci_scan_bus_parented(struct device *parent,
int bus, struct pci_ops *ops, void *sysdata)
{
LIST_HEAD(resources);
Expand All @@ -1844,7 +1844,7 @@ struct pci_bus * __devinit pci_scan_bus_parented(struct device *parent,
}
EXPORT_SYMBOL(pci_scan_bus_parented);

struct pci_bus * __devinit pci_scan_bus(int bus, struct pci_ops *ops,
struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops,
void *sysdata)
{
LIST_HEAD(resources);
Expand Down
Loading

0 comments on commit 15856ad

Please sign in to comment.