You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
Merge tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core updates from Greg Kroah-Hartman: "Here's the large driver core updates for 3.8-rc1. The biggest thing here is the various __dev* marking removals. This is going to be a pain for the merge with different subsystem trees, I know, but all of the patches included here have been ACKed by their various subsystem maintainers, as they wanted them to go through here. If this is too much of a pain, I can pull all of them out of this tree and just send you one with the other fixes/updates and then, after 3.8-rc1 is out, do the rest of the removals to ensure we catch them all, it's up to you. The merges should all be trivial, and Stephen has been doing them all in linux-next for a few weeks now quite easily. Other than the __dev* marking removals, there's nothing major here, some firmware loading updates and other minor things in the driver core. All of these have (much to Stephen's annoyance), been in linux-next for a while. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>" Fixed up trivial conflicts in drivers/gpio/gpio-{em,stmpe}.c due to gpio update. * tag 'driver-core-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (93 commits) modpost.c: Stop checking __dev* section mismatches init.h: Remove __dev* sections from the kernel acpi: remove use of __devinit PCI: Remove __dev* markings PCI: Always build setup-bus when PCI is enabled PCI: Move pci_uevent into pci-driver.c PCI: Remove CONFIG_HOTPLUG ifdefs unicore32/PCI: Remove CONFIG_HOTPLUG ifdefs sh/PCI: Remove CONFIG_HOTPLUG ifdefs powerpc/PCI: Remove CONFIG_HOTPLUG ifdefs mips/PCI: Remove CONFIG_HOTPLUG ifdefs microblaze/PCI: Remove CONFIG_HOTPLUG ifdefs dma: remove use of __devinit dma: remove use of __devexit_p firewire: remove use of __devinitdata firewire: remove use of __devinit leds: remove use of __devexit leds: remove use of __devinit leds: remove use of __devexit_p mmc: remove use of __devexit ...
This commit is contained in:
Linus Torvalds
@@ -4,7 +4,7 @@
|
||||
|
||||
obj-y += access.o bus.o probe.o host-bridge.o remove.o pci.o \
|
||||
pci-driver.o search.o pci-sysfs.o rom.o setup-res.o \
|
||||
irq.o vpd.o
|
||||
irq.o vpd.o setup-bus.o
|
||||
obj-$(CONFIG_PROC_FS) += proc.o
|
||||
obj-$(CONFIG_SYSFS) += slot.o
|
||||
|
||||
@@ -15,8 +15,6 @@ obj-$(CONFIG_PCIEPORTBUS) += pcie/
|
||||
|
||||
obj-$(CONFIG_PCI_IOAPIC) += ioapic.o
|
||||
|
||||
obj-$(CONFIG_HOTPLUG) += hotplug.o
|
||||
|
||||
# Build the PCI Hotplug drivers if we were asked to
|
||||
obj-$(CONFIG_HOTPLUG_PCI) += hotplug/
|
||||
ifdef CONFIG_HOTPLUG_PCI
|
||||
@@ -60,9 +58,6 @@ obj-$(CONFIG_ACPI) += pci-acpi.o
|
||||
# SMBIOS provided firmware instance and labels
|
||||
obj-$(CONFIG_PCI_LABEL) += pci-label.o
|
||||
|
||||
# Cardbus & CompactPCI use setup-bus
|
||||
obj-$(CONFIG_HOTPLUG) += setup-bus.o
|
||||
|
||||
obj-$(CONFIG_PCI_SYSCALL) += syscall.o
|
||||
|
||||
obj-$(CONFIG_PCI_STUB) += pci-stub.o
|
||||
|
||||
@@ -1,37 +0,0 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/module.h>
|
||||
#include "pci.h"
|
||||
|
||||
int pci_uevent(struct device *dev, struct kobj_uevent_env *env)
|
||||
{
|
||||
struct pci_dev *pdev;
|
||||
|
||||
if (!dev)
|
||||
return -ENODEV;
|
||||
|
||||
pdev = to_pci_dev(dev);
|
||||
if (!pdev)
|
||||
return -ENODEV;
|
||||
|
||||
if (add_uevent_var(env, "PCI_CLASS=%04X", pdev->class))
|
||||
return -ENOMEM;
|
||||
|
||||
if (add_uevent_var(env, "PCI_ID=%04X:%04X", pdev->vendor, pdev->device))
|
||||
return -ENOMEM;
|
||||
|
||||
if (add_uevent_var(env, "PCI_SUBSYS_ID=%04X:%04X", pdev->subsystem_vendor,
|
||||
pdev->subsystem_device))
|
||||
return -ENOMEM;
|
||||
|
||||
if (add_uevent_var(env, "PCI_SLOT_NAME=%s", pci_name(pdev)))
|
||||
return -ENOMEM;
|
||||
|
||||
if (add_uevent_var(env, "MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x",
|
||||
pdev->vendor, pdev->device,
|
||||
pdev->subsystem_vendor, pdev->subsystem_device,
|
||||
(u8)(pdev->class >> 16), (u8)(pdev->class >> 8),
|
||||
(u8)(pdev->class)))
|
||||
return -ENOMEM;
|
||||
return 0;
|
||||
}
|
||||
@@ -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_unregister_bus(bus0);
|
||||
@@ -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)
|
||||
|
||||
@@ -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;
|
||||
@@ -88,7 +88,7 @@ exit_free:
|
||||
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);
|
||||
|
||||
@@ -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)
|
||||
|
||||
+30
-12
@@ -89,10 +89,6 @@ static void pci_free_dynids(struct pci_driver *drv)
|
||||
spin_unlock(&drv->dynids.lock);
|
||||
}
|
||||
|
||||
/*
|
||||
* Dynamic device ID manipulation via sysfs is disabled for !CONFIG_HOTPLUG
|
||||
*/
|
||||
#ifdef CONFIG_HOTPLUG
|
||||
/**
|
||||
* store_new_id - sysfs frontend to pci_add_dynid()
|
||||
* @driver: target device driver
|
||||
@@ -191,10 +187,6 @@ static struct driver_attribute pci_drv_attrs[] = {
|
||||
__ATTR_NULL,
|
||||
};
|
||||
|
||||
#else
|
||||
#define pci_drv_attrs NULL
|
||||
#endif /* CONFIG_HOTPLUG */
|
||||
|
||||
/**
|
||||
* pci_match_id - See if a pci device matches a given pci_id table
|
||||
* @ids: array of PCI device id structures to search in
|
||||
@@ -1223,12 +1215,38 @@ void pci_dev_put(struct pci_dev *dev)
|
||||
put_device(&dev->dev);
|
||||
}
|
||||
|
||||
#ifndef CONFIG_HOTPLUG
|
||||
int pci_uevent(struct device *dev, struct kobj_uevent_env *env)
|
||||
static int pci_uevent(struct device *dev, struct kobj_uevent_env *env)
|
||||
{
|
||||
return -ENODEV;
|
||||
struct pci_dev *pdev;
|
||||
|
||||
if (!dev)
|
||||
return -ENODEV;
|
||||
|
||||
pdev = to_pci_dev(dev);
|
||||
if (!pdev)
|
||||
return -ENODEV;
|
||||
|
||||
if (add_uevent_var(env, "PCI_CLASS=%04X", pdev->class))
|
||||
return -ENOMEM;
|
||||
|
||||
if (add_uevent_var(env, "PCI_ID=%04X:%04X", pdev->vendor, pdev->device))
|
||||
return -ENOMEM;
|
||||
|
||||
if (add_uevent_var(env, "PCI_SUBSYS_ID=%04X:%04X", pdev->subsystem_vendor,
|
||||
pdev->subsystem_device))
|
||||
return -ENOMEM;
|
||||
|
||||
if (add_uevent_var(env, "PCI_SLOT_NAME=%s", pci_name(pdev)))
|
||||
return -ENOMEM;
|
||||
|
||||
if (add_uevent_var(env, "MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x",
|
||||
pdev->vendor, pdev->device,
|
||||
pdev->subsystem_vendor, pdev->subsystem_device,
|
||||
(u8)(pdev->class >> 16), (u8)(pdev->class >> 8),
|
||||
(u8)(pdev->class)))
|
||||
return -ENOMEM;
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
struct bus_type pci_bus_type = {
|
||||
.name = "pci",
|
||||
|
||||
@@ -284,7 +284,6 @@ msi_bus_store(struct device *dev, struct device_attribute *attr,
|
||||
return count;
|
||||
}
|
||||
|
||||
#ifdef CONFIG_HOTPLUG
|
||||
static DEFINE_MUTEX(pci_remove_rescan_mutex);
|
||||
static ssize_t bus_rescan_store(struct bus_type *bus, const char *buf,
|
||||
size_t count)
|
||||
@@ -377,8 +376,6 @@ dev_bus_rescan_store(struct device *dev, struct device_attribute *attr,
|
||||
return count;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI)
|
||||
static ssize_t d3cold_allowed_store(struct device *dev,
|
||||
struct device_attribute *attr,
|
||||
@@ -424,10 +421,8 @@ struct device_attribute pci_dev_attrs[] = {
|
||||
__ATTR(broken_parity_status,(S_IRUGO|S_IWUSR),
|
||||
broken_parity_status_show,broken_parity_status_store),
|
||||
__ATTR(msi_bus, 0644, msi_bus_show, msi_bus_store),
|
||||
#ifdef CONFIG_HOTPLUG
|
||||
__ATTR(remove, (S_IWUSR|S_IWGRP), NULL, remove_store),
|
||||
__ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, dev_rescan_store),
|
||||
#endif
|
||||
#if defined(CONFIG_PM_RUNTIME) && defined(CONFIG_ACPI)
|
||||
__ATTR(d3cold_allowed, 0644, d3cold_allowed_show, d3cold_allowed_store),
|
||||
#endif
|
||||
@@ -435,9 +430,7 @@ struct device_attribute pci_dev_attrs[] = {
|
||||
};
|
||||
|
||||
struct device_attribute pcibus_dev_attrs[] = {
|
||||
#ifdef CONFIG_HOTPLUG
|
||||
__ATTR(rescan, (S_IWUSR|S_IWGRP), NULL, dev_bus_rescan_store),
|
||||
#endif
|
||||
__ATTR(cpuaffinity, S_IRUGO, pci_bus_show_cpumaskaffinity, NULL),
|
||||
__ATTR(cpulistaffinity, S_IRUGO, pci_bus_show_cpulistaffinity, NULL),
|
||||
__ATTR_NULL,
|
||||
|
||||
+2
-2
@@ -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;
|
||||
|
||||
/*
|
||||
@@ -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;
|
||||
|
||||
@@ -8,7 +8,6 @@
|
||||
|
||||
/* Functions internal to the PCI core code */
|
||||
|
||||
extern int pci_uevent(struct device *dev, struct kobj_uevent_env *env);
|
||||
extern int pci_create_sysfs_dev_files(struct pci_dev *pdev);
|
||||
extern void pci_remove_sysfs_dev_files(struct pci_dev *pdev);
|
||||
#if !defined(CONFIG_DMI) && !defined(CONFIG_ACPI)
|
||||
@@ -159,11 +158,7 @@ static inline int pci_no_d1d2(struct pci_dev *dev)
|
||||
}
|
||||
extern struct device_attribute pci_dev_attrs[];
|
||||
extern struct device_attribute pcibus_dev_attrs[];
|
||||
#ifdef CONFIG_HOTPLUG
|
||||
extern struct bus_attribute pci_bus_attrs[];
|
||||
#else
|
||||
#define pci_bus_attrs NULL
|
||||
#endif
|
||||
|
||||
|
||||
/**
|
||||
|
||||
@@ -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);
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
+9
-11
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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);
|
||||
@@ -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;
|
||||
@@ -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;
|
||||
@@ -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);
|
||||
@@ -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);
|
||||
@@ -1864,7 +1864,6 @@ struct pci_bus * __devinit pci_scan_bus(int bus, struct pci_ops *ops,
|
||||
}
|
||||
EXPORT_SYMBOL(pci_scan_bus);
|
||||
|
||||
#ifdef CONFIG_HOTPLUG
|
||||
/**
|
||||
* pci_rescan_bus_bridge_resize - scan a PCI bus for devices.
|
||||
* @bridge: PCI bridge for the bus to scan
|
||||
@@ -1894,7 +1893,6 @@ EXPORT_SYMBOL(pci_add_new_bus);
|
||||
EXPORT_SYMBOL(pci_scan_slot);
|
||||
EXPORT_SYMBOL(pci_scan_bridge);
|
||||
EXPORT_SYMBOL_GPL(pci_scan_child_bus);
|
||||
#endif
|
||||
|
||||
static int __init pci_sort_bf_cmp(const struct device *d_a, const struct device *d_b)
|
||||
{
|
||||
|
||||
+66
-66
File diff suppressed because it is too large
Load Diff
@@ -412,7 +412,7 @@ static int pcifront_claim_resource(struct pci_dev *dev, void *data)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit pcifront_scan_bus(struct pcifront_device *pdev,
|
||||
static int pcifront_scan_bus(struct pcifront_device *pdev,
|
||||
unsigned int domain, unsigned int bus,
|
||||
struct pci_bus *b)
|
||||
{
|
||||
@@ -441,7 +441,7 @@ static int __devinit pcifront_scan_bus(struct pcifront_device *pdev,
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int __devinit pcifront_scan_root(struct pcifront_device *pdev,
|
||||
static int pcifront_scan_root(struct pcifront_device *pdev,
|
||||
unsigned int domain, unsigned int bus)
|
||||
{
|
||||
struct pci_bus *b;
|
||||
@@ -503,7 +503,7 @@ err_out:
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __devinit pcifront_rescan_root(struct pcifront_device *pdev,
|
||||
static int pcifront_rescan_root(struct pcifront_device *pdev,
|
||||
unsigned int domain, unsigned int bus)
|
||||
{
|
||||
int err;
|
||||
@@ -834,7 +834,7 @@ out:
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __devinit pcifront_try_connect(struct pcifront_device *pdev)
|
||||
static int pcifront_try_connect(struct pcifront_device *pdev)
|
||||
{
|
||||
int err = -EFAULT;
|
||||
int i, num_roots, len;
|
||||
@@ -924,7 +924,7 @@ out:
|
||||
return err;
|
||||
}
|
||||
|
||||
static int __devinit pcifront_attach_devices(struct pcifront_device *pdev)
|
||||
static int pcifront_attach_devices(struct pcifront_device *pdev)
|
||||
{
|
||||
int err = -EFAULT;
|
||||
int i, num_roots, len;
|
||||
|
||||
Reference in New Issue
Block a user