diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-05 14:35:58 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-05 14:35:58 -0400 |
commit | 346fced899c7390e555cf90cd07d1e56b460d21b (patch) | |
tree | 4732fbdfc3bd40b5a2fd888bb741f42730e7c74d | |
parent | 17af691cd19765b782d891fc50c1568d0f1276b3 (diff) | |
parent | 43a6b76050aa137c51d00eec91d67ac43ac3846e (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
-rw-r--r-- | arch/i386/kernel/cpu/cpufreq/gx-suspmod.c | 2 | ||||
-rw-r--r-- | arch/i386/pci/common.c | 1 | ||||
-rw-r--r-- | arch/i386/pci/i386.c | 11 | ||||
-rw-r--r-- | drivers/char/hw_random.c | 2 | ||||
-rw-r--r-- | drivers/char/watchdog/i8xx_tco.c | 2 | ||||
-rw-r--r-- | drivers/ide/setup-pci.c | 2 | ||||
-rw-r--r-- | drivers/parport/parport_pc.c | 2 | ||||
-rw-r--r-- | drivers/pci/Makefile | 1 | ||||
-rw-r--r-- | drivers/pci/hotplug.c | 2 | ||||
-rw-r--r-- | drivers/pci/pci-driver.c | 196 | ||||
-rw-r--r-- | drivers/pci/pci.c | 6 | ||||
-rw-r--r-- | drivers/pci/pcie/portdrv.h | 5 | ||||
-rw-r--r-- | drivers/pci/pcie/portdrv_core.c | 8 | ||||
-rw-r--r-- | drivers/pci/pcie/portdrv_pci.c | 79 | ||||
-rw-r--r-- | drivers/pci/probe.c | 24 | ||||
-rw-r--r-- | drivers/pci/quirks.c | 1 | ||||
-rw-r--r-- | drivers/pci/setup-bus.c | 2 | ||||
-rw-r--r-- | include/linux/pci-dynids.h | 18 | ||||
-rw-r--r-- | include/linux/pci.h | 5 | ||||
-rw-r--r-- | sound/pci/bt87x.c | 2 |
20 files changed, 205 insertions, 166 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c b/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c index 1a49adb1f4a6..e86ea486c311 100644 --- a/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c +++ b/arch/i386/kernel/cpu/cpufreq/gx-suspmod.c | |||
@@ -190,7 +190,7 @@ static __init struct pci_dev *gx_detect_chipset(void) | |||
190 | 190 | ||
191 | /* detect which companion chip is used */ | 191 | /* detect which companion chip is used */ |
192 | while ((gx_pci = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, gx_pci)) != NULL) { | 192 | while ((gx_pci = pci_get_device(PCI_ANY_ID, PCI_ANY_ID, gx_pci)) != NULL) { |
193 | if ((pci_match_device (gx_chipset_tbl, gx_pci)) != NULL) { | 193 | if ((pci_match_id(gx_chipset_tbl, gx_pci)) != NULL) { |
194 | return gx_pci; | 194 | return gx_pci; |
195 | } | 195 | } |
196 | } | 196 | } |
diff --git a/arch/i386/pci/common.c b/arch/i386/pci/common.c index 87325263cd4f..70bcd53451f6 100644 --- a/arch/i386/pci/common.c +++ b/arch/i386/pci/common.c | |||
@@ -165,6 +165,7 @@ static int __init pcibios_init(void) | |||
165 | if ((pci_probe & PCI_BIOS_SORT) && !(pci_probe & PCI_NO_SORT)) | 165 | if ((pci_probe & PCI_BIOS_SORT) && !(pci_probe & PCI_NO_SORT)) |
166 | pcibios_sort(); | 166 | pcibios_sort(); |
167 | #endif | 167 | #endif |
168 | pci_assign_unassigned_resources(); | ||
168 | return 0; | 169 | return 0; |
169 | } | 170 | } |
170 | 171 | ||
diff --git a/arch/i386/pci/i386.c b/arch/i386/pci/i386.c index c205ea7e233b..93a364c82150 100644 --- a/arch/i386/pci/i386.c +++ b/arch/i386/pci/i386.c | |||
@@ -106,11 +106,16 @@ static void __init pcibios_allocate_bus_resources(struct list_head *bus_list) | |||
106 | if ((dev = bus->self)) { | 106 | if ((dev = bus->self)) { |
107 | for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) { | 107 | for (idx = PCI_BRIDGE_RESOURCES; idx < PCI_NUM_RESOURCES; idx++) { |
108 | r = &dev->resource[idx]; | 108 | r = &dev->resource[idx]; |
109 | if (!r->start) | 109 | if (!r->flags) |
110 | continue; | 110 | continue; |
111 | pr = pci_find_parent_resource(dev, r); | 111 | pr = pci_find_parent_resource(dev, r); |
112 | if (!pr || request_resource(pr, r) < 0) | 112 | if (!r->start || !pr || request_resource(pr, r) < 0) { |
113 | printk(KERN_ERR "PCI: Cannot allocate resource region %d of bridge %s\n", idx, pci_name(dev)); | 113 | printk(KERN_ERR "PCI: Cannot allocate resource region %d of bridge %s\n", idx, pci_name(dev)); |
114 | /* Something is wrong with the region. | ||
115 | Invalidate the resource to prevent child | ||
116 | resource allocations in this range. */ | ||
117 | r->flags = 0; | ||
118 | } | ||
114 | } | 119 | } |
115 | } | 120 | } |
116 | pcibios_allocate_bus_resources(&bus->children); | 121 | pcibios_allocate_bus_resources(&bus->children); |
@@ -227,7 +232,7 @@ int pcibios_enable_resources(struct pci_dev *dev, int mask) | |||
227 | 232 | ||
228 | pci_read_config_word(dev, PCI_COMMAND, &cmd); | 233 | pci_read_config_word(dev, PCI_COMMAND, &cmd); |
229 | old_cmd = cmd; | 234 | old_cmd = cmd; |
230 | for(idx=0; idx<6; idx++) { | 235 | for(idx = 0; idx < PCI_NUM_RESOURCES; idx++) { |
231 | /* Only set up the requested stuff */ | 236 | /* Only set up the requested stuff */ |
232 | if (!(mask & (1<<idx))) | 237 | if (!(mask & (1<<idx))) |
233 | continue; | 238 | continue; |
diff --git a/drivers/char/hw_random.c b/drivers/char/hw_random.c index 7e6ac14c2450..3480535a09c5 100644 --- a/drivers/char/hw_random.c +++ b/drivers/char/hw_random.c | |||
@@ -579,7 +579,7 @@ static int __init rng_init (void) | |||
579 | 579 | ||
580 | /* Probe for Intel, AMD RNGs */ | 580 | /* Probe for Intel, AMD RNGs */ |
581 | for_each_pci_dev(pdev) { | 581 | for_each_pci_dev(pdev) { |
582 | ent = pci_match_device (rng_pci_tbl, pdev); | 582 | ent = pci_match_id(rng_pci_tbl, pdev); |
583 | if (ent) { | 583 | if (ent) { |
584 | rng_ops = &rng_vendor_ops[ent->driver_data]; | 584 | rng_ops = &rng_vendor_ops[ent->driver_data]; |
585 | goto match; | 585 | goto match; |
diff --git a/drivers/char/watchdog/i8xx_tco.c b/drivers/char/watchdog/i8xx_tco.c index b14d642439ed..5d07ee59679d 100644 --- a/drivers/char/watchdog/i8xx_tco.c +++ b/drivers/char/watchdog/i8xx_tco.c | |||
@@ -401,7 +401,7 @@ static unsigned char __init i8xx_tco_getdevice (void) | |||
401 | */ | 401 | */ |
402 | 402 | ||
403 | while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { | 403 | while ((dev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, dev)) != NULL) { |
404 | if (pci_match_device(i8xx_tco_pci_tbl, dev)) { | 404 | if (pci_match_id(i8xx_tco_pci_tbl, dev)) { |
405 | i8xx_tco_pci = dev; | 405 | i8xx_tco_pci = dev; |
406 | break; | 406 | break; |
407 | } | 407 | } |
diff --git a/drivers/ide/setup-pci.c b/drivers/ide/setup-pci.c index e501675ad72e..77da827b2898 100644 --- a/drivers/ide/setup-pci.c +++ b/drivers/ide/setup-pci.c | |||
@@ -847,7 +847,7 @@ static int __init ide_scan_pcidev(struct pci_dev *dev) | |||
847 | d = list_entry(l, struct pci_driver, node); | 847 | d = list_entry(l, struct pci_driver, node); |
848 | if(d->id_table) | 848 | if(d->id_table) |
849 | { | 849 | { |
850 | const struct pci_device_id *id = pci_match_device(d->id_table, dev); | 850 | const struct pci_device_id *id = pci_match_id(d->id_table, dev); |
851 | if(id != NULL) | 851 | if(id != NULL) |
852 | { | 852 | { |
853 | if(d->probe(dev, id) >= 0) | 853 | if(d->probe(dev, id) >= 0) |
diff --git a/drivers/parport/parport_pc.c b/drivers/parport/parport_pc.c index 80edfa3abd29..4598c6a9212d 100644 --- a/drivers/parport/parport_pc.c +++ b/drivers/parport/parport_pc.c | |||
@@ -3008,7 +3008,7 @@ static int __init parport_pc_init_superio (int autoirq, int autodma) | |||
3008 | int ret = 0; | 3008 | int ret = 0; |
3009 | 3009 | ||
3010 | while ((pdev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pdev)) != NULL) { | 3010 | while ((pdev = pci_find_device(PCI_ANY_ID, PCI_ANY_ID, pdev)) != NULL) { |
3011 | id = pci_match_device (parport_pc_pci_tbl, pdev); | 3011 | id = pci_match_id(parport_pc_pci_tbl, pdev); |
3012 | if (id == NULL || id->driver_data >= last_sio) | 3012 | if (id == NULL || id->driver_data >= last_sio) |
3013 | continue; | 3013 | continue; |
3014 | 3014 | ||
diff --git a/drivers/pci/Makefile b/drivers/pci/Makefile index 7dea494c0d7b..3657f6199c48 100644 --- a/drivers/pci/Makefile +++ b/drivers/pci/Makefile | |||
@@ -19,6 +19,7 @@ obj-$(CONFIG_HOTPLUG_PCI) += hotplug/ | |||
19 | # | 19 | # |
20 | # Some architectures use the generic PCI setup functions | 20 | # Some architectures use the generic PCI setup functions |
21 | # | 21 | # |
22 | obj-$(CONFIG_X86) += setup-bus.o | ||
22 | obj-$(CONFIG_ALPHA) += setup-bus.o setup-irq.o | 23 | obj-$(CONFIG_ALPHA) += setup-bus.o setup-irq.o |
23 | obj-$(CONFIG_ARM) += setup-bus.o setup-irq.o | 24 | obj-$(CONFIG_ARM) += setup-bus.o setup-irq.o |
24 | obj-$(CONFIG_PARISC) += setup-bus.o | 25 | obj-$(CONFIG_PARISC) += setup-bus.o |
diff --git a/drivers/pci/hotplug.c b/drivers/pci/hotplug.c index 3903f8c559b6..b844bc972324 100644 --- a/drivers/pci/hotplug.c +++ b/drivers/pci/hotplug.c | |||
@@ -54,7 +54,7 @@ int pci_hotplug (struct device *dev, char **envp, int num_envp, | |||
54 | 54 | ||
55 | envp[i++] = scratch; | 55 | envp[i++] = scratch; |
56 | length += scnprintf (scratch, buffer_size - length, | 56 | length += scnprintf (scratch, buffer_size - length, |
57 | "MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x\n", | 57 | "MODALIAS=pci:v%08Xd%08Xsv%08Xsd%08Xbc%02Xsc%02Xi%02x", |
58 | pdev->vendor, pdev->device, | 58 | pdev->vendor, pdev->device, |
59 | pdev->subsystem_vendor, pdev->subsystem_device, | 59 | pdev->subsystem_vendor, pdev->subsystem_device, |
60 | (u8)(pdev->class >> 16), (u8)(pdev->class >> 8), | 60 | (u8)(pdev->class >> 16), (u8)(pdev->class >> 8), |
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index e65bf2b395aa..aac6de9568e5 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c | |||
@@ -7,7 +7,6 @@ | |||
7 | #include <linux/module.h> | 7 | #include <linux/module.h> |
8 | #include <linux/init.h> | 8 | #include <linux/init.h> |
9 | #include <linux/device.h> | 9 | #include <linux/device.h> |
10 | #include <linux/pci-dynids.h> | ||
11 | #include "pci.h" | 10 | #include "pci.h" |
12 | 11 | ||
13 | /* | 12 | /* |
@@ -19,35 +18,11 @@ | |||
19 | */ | 18 | */ |
20 | 19 | ||
21 | #ifdef CONFIG_HOTPLUG | 20 | #ifdef CONFIG_HOTPLUG |
22 | /** | ||
23 | * pci_device_probe_dynamic() | ||
24 | * | ||
25 | * Walk the dynamic ID list looking for a match. | ||
26 | * returns 0 and sets pci_dev->driver when drv claims pci_dev, else error. | ||
27 | */ | ||
28 | static int | ||
29 | pci_device_probe_dynamic(struct pci_driver *drv, struct pci_dev *pci_dev) | ||
30 | { | ||
31 | int error = -ENODEV; | ||
32 | struct list_head *pos; | ||
33 | struct dynid *dynid; | ||
34 | 21 | ||
35 | spin_lock(&drv->dynids.lock); | 22 | struct pci_dynid { |
36 | list_for_each(pos, &drv->dynids.list) { | 23 | struct list_head node; |
37 | dynid = list_entry(pos, struct dynid, node); | 24 | struct pci_device_id id; |
38 | if (pci_match_one_device(&dynid->id, pci_dev)) { | 25 | }; |
39 | spin_unlock(&drv->dynids.lock); | ||
40 | error = drv->probe(pci_dev, &dynid->id); | ||
41 | if (error >= 0) { | ||
42 | pci_dev->driver = drv; | ||
43 | return 0; | ||
44 | } | ||
45 | return error; | ||
46 | } | ||
47 | } | ||
48 | spin_unlock(&drv->dynids.lock); | ||
49 | return error; | ||
50 | } | ||
51 | 26 | ||
52 | /** | 27 | /** |
53 | * store_new_id | 28 | * store_new_id |
@@ -58,8 +33,7 @@ pci_device_probe_dynamic(struct pci_driver *drv, struct pci_dev *pci_dev) | |||
58 | static inline ssize_t | 33 | static inline ssize_t |
59 | store_new_id(struct device_driver *driver, const char *buf, size_t count) | 34 | store_new_id(struct device_driver *driver, const char *buf, size_t count) |
60 | { | 35 | { |
61 | struct dynid *dynid; | 36 | struct pci_dynid *dynid; |
62 | struct bus_type * bus; | ||
63 | struct pci_driver *pdrv = to_pci_driver(driver); | 37 | struct pci_driver *pdrv = to_pci_driver(driver); |
64 | __u32 vendor=PCI_ANY_ID, device=PCI_ANY_ID, subvendor=PCI_ANY_ID, | 38 | __u32 vendor=PCI_ANY_ID, device=PCI_ANY_ID, subvendor=PCI_ANY_ID, |
65 | subdevice=PCI_ANY_ID, class=0, class_mask=0; | 39 | subdevice=PCI_ANY_ID, class=0, class_mask=0; |
@@ -91,37 +65,22 @@ store_new_id(struct device_driver *driver, const char *buf, size_t count) | |||
91 | list_add_tail(&pdrv->dynids.list, &dynid->node); | 65 | list_add_tail(&pdrv->dynids.list, &dynid->node); |
92 | spin_unlock(&pdrv->dynids.lock); | 66 | spin_unlock(&pdrv->dynids.lock); |
93 | 67 | ||
94 | bus = get_bus(pdrv->driver.bus); | 68 | if (get_driver(&pdrv->driver)) { |
95 | if (bus) { | 69 | driver_attach(&pdrv->driver); |
96 | if (get_driver(&pdrv->driver)) { | 70 | put_driver(&pdrv->driver); |
97 | down_write(&bus->subsys.rwsem); | ||
98 | driver_attach(&pdrv->driver); | ||
99 | up_write(&bus->subsys.rwsem); | ||
100 | put_driver(&pdrv->driver); | ||
101 | } | ||
102 | put_bus(bus); | ||
103 | } | 71 | } |
104 | 72 | ||
105 | return count; | 73 | return count; |
106 | } | 74 | } |
107 | |||
108 | static DRIVER_ATTR(new_id, S_IWUSR, NULL, store_new_id); | 75 | static DRIVER_ATTR(new_id, S_IWUSR, NULL, store_new_id); |
109 | static inline void | ||
110 | pci_init_dynids(struct pci_dynids *dynids) | ||
111 | { | ||
112 | spin_lock_init(&dynids->lock); | ||
113 | INIT_LIST_HEAD(&dynids->list); | ||
114 | } | ||
115 | 76 | ||
116 | static void | 77 | static void |
117 | pci_free_dynids(struct pci_driver *drv) | 78 | pci_free_dynids(struct pci_driver *drv) |
118 | { | 79 | { |
119 | struct list_head *pos, *n; | 80 | struct pci_dynid *dynid, *n; |
120 | struct dynid *dynid; | ||
121 | 81 | ||
122 | spin_lock(&drv->dynids.lock); | 82 | spin_lock(&drv->dynids.lock); |
123 | list_for_each_safe(pos, n, &drv->dynids.list) { | 83 | list_for_each_entry_safe(dynid, n, &drv->dynids.list, node) { |
124 | dynid = list_entry(pos, struct dynid, node); | ||
125 | list_del(&dynid->node); | 84 | list_del(&dynid->node); |
126 | kfree(dynid); | 85 | kfree(dynid); |
127 | } | 86 | } |
@@ -138,83 +97,70 @@ pci_create_newid_file(struct pci_driver *drv) | |||
138 | return error; | 97 | return error; |
139 | } | 98 | } |
140 | 99 | ||
141 | static int | ||
142 | pci_bus_match_dynids(const struct pci_dev *pci_dev, struct pci_driver *pci_drv) | ||
143 | { | ||
144 | struct list_head *pos; | ||
145 | struct dynid *dynid; | ||
146 | |||
147 | spin_lock(&pci_drv->dynids.lock); | ||
148 | list_for_each(pos, &pci_drv->dynids.list) { | ||
149 | dynid = list_entry(pos, struct dynid, node); | ||
150 | if (pci_match_one_device(&dynid->id, pci_dev)) { | ||
151 | spin_unlock(&pci_drv->dynids.lock); | ||
152 | return 1; | ||
153 | } | ||
154 | } | ||
155 | spin_unlock(&pci_drv->dynids.lock); | ||
156 | return 0; | ||
157 | } | ||
158 | |||
159 | #else /* !CONFIG_HOTPLUG */ | 100 | #else /* !CONFIG_HOTPLUG */ |
160 | static inline int pci_device_probe_dynamic(struct pci_driver *drv, struct pci_dev *pci_dev) | ||
161 | { | ||
162 | return -ENODEV; | ||
163 | } | ||
164 | static inline void pci_init_dynids(struct pci_dynids *dynids) {} | ||
165 | static inline void pci_free_dynids(struct pci_driver *drv) {} | 101 | static inline void pci_free_dynids(struct pci_driver *drv) {} |
166 | static inline int pci_create_newid_file(struct pci_driver *drv) | 102 | static inline int pci_create_newid_file(struct pci_driver *drv) |
167 | { | 103 | { |
168 | return 0; | 104 | return 0; |
169 | } | 105 | } |
170 | static inline int pci_bus_match_dynids(const struct pci_dev *pci_dev, struct pci_driver *pci_drv) | ||
171 | { | ||
172 | return 0; | ||
173 | } | ||
174 | #endif | 106 | #endif |
175 | 107 | ||
176 | /** | 108 | /** |
177 | * pci_match_device - Tell if a PCI device structure has a matching | 109 | * pci_match_id - See if a pci device matches a given pci_id table |
178 | * PCI device id structure | ||
179 | * @ids: array of PCI device id structures to search in | 110 | * @ids: array of PCI device id structures to search in |
180 | * @dev: the PCI device structure to match against | 111 | * @dev: the PCI device structure to match against. |
181 | * | 112 | * |
182 | * Used by a driver to check whether a PCI device present in the | 113 | * Used by a driver to check whether a PCI device present in the |
183 | * system is in its list of supported devices.Returns the matching | 114 | * system is in its list of supported devices. Returns the matching |
184 | * pci_device_id structure or %NULL if there is no match. | 115 | * pci_device_id structure or %NULL if there is no match. |
116 | * | ||
117 | * Depreciated, don't use this as it will not catch any dynamic ids | ||
118 | * that a driver might want to check for. | ||
185 | */ | 119 | */ |
186 | const struct pci_device_id * | 120 | const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, |
187 | pci_match_device(const struct pci_device_id *ids, const struct pci_dev *dev) | 121 | struct pci_dev *dev) |
188 | { | 122 | { |
189 | while (ids->vendor || ids->subvendor || ids->class_mask) { | 123 | if (ids) { |
190 | if (pci_match_one_device(ids, dev)) | 124 | while (ids->vendor || ids->subvendor || ids->class_mask) { |
191 | return ids; | 125 | if (pci_match_one_device(ids, dev)) |
192 | ids++; | 126 | return ids; |
127 | ids++; | ||
128 | } | ||
193 | } | 129 | } |
194 | return NULL; | 130 | return NULL; |
195 | } | 131 | } |
196 | 132 | ||
197 | /** | 133 | /** |
198 | * pci_device_probe_static() | 134 | * pci_match_device - Tell if a PCI device structure has a matching |
199 | * | 135 | * PCI device id structure |
200 | * returns 0 and sets pci_dev->driver when drv claims pci_dev, else error. | 136 | * @ids: array of PCI device id structures to search in |
137 | * @dev: the PCI device structure to match against | ||
138 | * @drv: the PCI driver to match against | ||
139 | * | ||
140 | * Used by a driver to check whether a PCI device present in the | ||
141 | * system is in its list of supported devices. Returns the matching | ||
142 | * pci_device_id structure or %NULL if there is no match. | ||
201 | */ | 143 | */ |
202 | static int | 144 | const struct pci_device_id *pci_match_device(struct pci_driver *drv, |
203 | pci_device_probe_static(struct pci_driver *drv, struct pci_dev *pci_dev) | 145 | struct pci_dev *dev) |
204 | { | 146 | { |
205 | int error = -ENODEV; | ||
206 | const struct pci_device_id *id; | 147 | const struct pci_device_id *id; |
148 | struct pci_dynid *dynid; | ||
207 | 149 | ||
208 | if (!drv->id_table) | 150 | id = pci_match_id(drv->id_table, dev); |
209 | return error; | ||
210 | id = pci_match_device(drv->id_table, pci_dev); | ||
211 | if (id) | 151 | if (id) |
212 | error = drv->probe(pci_dev, id); | 152 | return id; |
213 | if (error >= 0) { | 153 | |
214 | pci_dev->driver = drv; | 154 | /* static ids didn't match, lets look at the dynamic ones */ |
215 | error = 0; | 155 | spin_lock(&drv->dynids.lock); |
156 | list_for_each_entry(dynid, &drv->dynids.list, node) { | ||
157 | if (pci_match_one_device(&dynid->id, dev)) { | ||
158 | spin_unlock(&drv->dynids.lock); | ||
159 | return &dynid->id; | ||
160 | } | ||
216 | } | 161 | } |
217 | return error; | 162 | spin_unlock(&drv->dynids.lock); |
163 | return NULL; | ||
218 | } | 164 | } |
219 | 165 | ||
220 | /** | 166 | /** |
@@ -225,13 +171,20 @@ pci_device_probe_static(struct pci_driver *drv, struct pci_dev *pci_dev) | |||
225 | */ | 171 | */ |
226 | static int | 172 | static int |
227 | __pci_device_probe(struct pci_driver *drv, struct pci_dev *pci_dev) | 173 | __pci_device_probe(struct pci_driver *drv, struct pci_dev *pci_dev) |
228 | { | 174 | { |
175 | const struct pci_device_id *id; | ||
229 | int error = 0; | 176 | int error = 0; |
230 | 177 | ||
231 | if (!pci_dev->driver && drv->probe) { | 178 | if (!pci_dev->driver && drv->probe) { |
232 | error = pci_device_probe_static(drv, pci_dev); | 179 | error = -ENODEV; |
233 | if (error == -ENODEV) | 180 | |
234 | error = pci_device_probe_dynamic(drv, pci_dev); | 181 | id = pci_match_device(drv, pci_dev); |
182 | if (id) | ||
183 | error = drv->probe(pci_dev, id); | ||
184 | if (error >= 0) { | ||
185 | pci_dev->driver = drv; | ||
186 | error = 0; | ||
187 | } | ||
235 | } | 188 | } |
236 | return error; | 189 | return error; |
237 | } | 190 | } |
@@ -371,12 +324,6 @@ static struct kobj_type pci_driver_kobj_type = { | |||
371 | .sysfs_ops = &pci_driver_sysfs_ops, | 324 | .sysfs_ops = &pci_driver_sysfs_ops, |
372 | }; | 325 | }; |
373 | 326 | ||
374 | static int | ||
375 | pci_populate_driver_dir(struct pci_driver *drv) | ||
376 | { | ||
377 | return pci_create_newid_file(drv); | ||
378 | } | ||
379 | |||
380 | /** | 327 | /** |
381 | * pci_register_driver - register a new pci driver | 328 | * pci_register_driver - register a new pci driver |
382 | * @drv: the driver structure to register | 329 | * @drv: the driver structure to register |
@@ -401,13 +348,15 @@ int pci_register_driver(struct pci_driver *drv) | |||
401 | drv->driver.shutdown = pci_device_shutdown; | 348 | drv->driver.shutdown = pci_device_shutdown; |
402 | drv->driver.owner = drv->owner; | 349 | drv->driver.owner = drv->owner; |
403 | drv->driver.kobj.ktype = &pci_driver_kobj_type; | 350 | drv->driver.kobj.ktype = &pci_driver_kobj_type; |
404 | pci_init_dynids(&drv->dynids); | 351 | |
352 | spin_lock_init(&drv->dynids.lock); | ||
353 | INIT_LIST_HEAD(&drv->dynids.list); | ||
405 | 354 | ||
406 | /* register with core */ | 355 | /* register with core */ |
407 | error = driver_register(&drv->driver); | 356 | error = driver_register(&drv->driver); |
408 | 357 | ||
409 | if (!error) | 358 | if (!error) |
410 | pci_populate_driver_dir(drv); | 359 | error = pci_create_newid_file(drv); |
411 | 360 | ||
412 | return error; | 361 | return error; |
413 | } | 362 | } |
@@ -463,21 +412,17 @@ pci_dev_driver(const struct pci_dev *dev) | |||
463 | * system is in its list of supported devices.Returns the matching | 412 | * system is in its list of supported devices.Returns the matching |
464 | * pci_device_id structure or %NULL if there is no match. | 413 | * pci_device_id structure or %NULL if there is no match. |
465 | */ | 414 | */ |
466 | static int pci_bus_match(struct device * dev, struct device_driver * drv) | 415 | static int pci_bus_match(struct device *dev, struct device_driver *drv) |
467 | { | 416 | { |
468 | const struct pci_dev * pci_dev = to_pci_dev(dev); | 417 | struct pci_dev *pci_dev = to_pci_dev(dev); |
469 | struct pci_driver * pci_drv = to_pci_driver(drv); | 418 | struct pci_driver *pci_drv = to_pci_driver(drv); |
470 | const struct pci_device_id * ids = pci_drv->id_table; | ||
471 | const struct pci_device_id *found_id; | 419 | const struct pci_device_id *found_id; |
472 | 420 | ||
473 | if (!ids) | 421 | found_id = pci_match_device(pci_drv, pci_dev); |
474 | return 0; | ||
475 | |||
476 | found_id = pci_match_device(ids, pci_dev); | ||
477 | if (found_id) | 422 | if (found_id) |
478 | return 1; | 423 | return 1; |
479 | 424 | ||
480 | return pci_bus_match_dynids(pci_dev, pci_drv); | 425 | return 0; |
481 | } | 426 | } |
482 | 427 | ||
483 | /** | 428 | /** |
@@ -536,6 +481,7 @@ static int __init pci_driver_init(void) | |||
536 | 481 | ||
537 | postcore_initcall(pci_driver_init); | 482 | postcore_initcall(pci_driver_init); |
538 | 483 | ||
484 | EXPORT_SYMBOL(pci_match_id); | ||
539 | EXPORT_SYMBOL(pci_match_device); | 485 | EXPORT_SYMBOL(pci_match_device); |
540 | EXPORT_SYMBOL(pci_register_driver); | 486 | EXPORT_SYMBOL(pci_register_driver); |
541 | EXPORT_SYMBOL(pci_unregister_driver); | 487 | EXPORT_SYMBOL(pci_unregister_driver); |
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index f04b9ffe4153..d382bdb7b560 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c | |||
@@ -334,10 +334,6 @@ EXPORT_SYMBOL(pci_choose_state); | |||
334 | /** | 334 | /** |
335 | * pci_save_state - save the PCI configuration space of a device before suspending | 335 | * pci_save_state - save the PCI configuration space of a device before suspending |
336 | * @dev: - PCI device that we're dealing with | 336 | * @dev: - PCI device that we're dealing with |
337 | * @buffer: - buffer to hold config space context | ||
338 | * | ||
339 | * @buffer must be large enough to hold the entire PCI 2.2 config space | ||
340 | * (>= 64 bytes). | ||
341 | */ | 337 | */ |
342 | int | 338 | int |
343 | pci_save_state(struct pci_dev *dev) | 339 | pci_save_state(struct pci_dev *dev) |
@@ -352,8 +348,6 @@ pci_save_state(struct pci_dev *dev) | |||
352 | /** | 348 | /** |
353 | * pci_restore_state - Restore the saved state of a PCI device | 349 | * pci_restore_state - Restore the saved state of a PCI device |
354 | * @dev: - PCI device that we're dealing with | 350 | * @dev: - PCI device that we're dealing with |
355 | * @buffer: - saved PCI config space | ||
356 | * | ||
357 | */ | 351 | */ |
358 | int | 352 | int |
359 | pci_restore_state(struct pci_dev *dev) | 353 | pci_restore_state(struct pci_dev *dev) |
diff --git a/drivers/pci/pcie/portdrv.h b/drivers/pci/pcie/portdrv.h index 537b372dc340..a63bd8f72601 100644 --- a/drivers/pci/pcie/portdrv.h +++ b/drivers/pci/pcie/portdrv.h | |||
@@ -27,6 +27,11 @@ | |||
27 | 27 | ||
28 | #define get_descriptor_id(type, service) (((type - 4) << 4) | service) | 28 | #define get_descriptor_id(type, service) (((type - 4) << 4) | service) |
29 | 29 | ||
30 | struct pcie_port_device_ext { | ||
31 | int interrupt_mode; /* [0:INTx | 1:MSI | 2:MSI-X] */ | ||
32 | unsigned int saved_msi_config_space[5]; | ||
33 | }; | ||
34 | |||
30 | extern struct bus_type pcie_port_bus_type; | 35 | extern struct bus_type pcie_port_bus_type; |
31 | extern int pcie_port_device_probe(struct pci_dev *dev); | 36 | extern int pcie_port_device_probe(struct pci_dev *dev); |
32 | extern int pcie_port_device_register(struct pci_dev *dev); | 37 | extern int pcie_port_device_register(struct pci_dev *dev); |
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c index f5c5f10a3d2f..4db69982876e 100644 --- a/drivers/pci/pcie/portdrv_core.c +++ b/drivers/pci/pcie/portdrv_core.c | |||
@@ -275,10 +275,17 @@ int pcie_port_device_probe(struct pci_dev *dev) | |||
275 | 275 | ||
276 | int pcie_port_device_register(struct pci_dev *dev) | 276 | int pcie_port_device_register(struct pci_dev *dev) |
277 | { | 277 | { |
278 | struct pcie_port_device_ext *p_ext; | ||
278 | int status, type, capabilities, irq_mode, i; | 279 | int status, type, capabilities, irq_mode, i; |
279 | int vectors[PCIE_PORT_DEVICE_MAXSERVICES]; | 280 | int vectors[PCIE_PORT_DEVICE_MAXSERVICES]; |
280 | u16 reg16; | 281 | u16 reg16; |
281 | 282 | ||
283 | /* Allocate port device extension */ | ||
284 | if (!(p_ext = kmalloc(sizeof(struct pcie_port_device_ext), GFP_KERNEL))) | ||
285 | return -ENOMEM; | ||
286 | |||
287 | pci_set_drvdata(dev, p_ext); | ||
288 | |||
282 | /* Get port type */ | 289 | /* Get port type */ |
283 | pci_read_config_word(dev, | 290 | pci_read_config_word(dev, |
284 | pci_find_capability(dev, PCI_CAP_ID_EXP) + | 291 | pci_find_capability(dev, PCI_CAP_ID_EXP) + |
@@ -288,6 +295,7 @@ int pcie_port_device_register(struct pci_dev *dev) | |||
288 | /* Now get port services */ | 295 | /* Now get port services */ |
289 | capabilities = get_port_device_capability(dev); | 296 | capabilities = get_port_device_capability(dev); |
290 | irq_mode = assign_interrupt_mode(dev, vectors, capabilities); | 297 | irq_mode = assign_interrupt_mode(dev, vectors, capabilities); |
298 | p_ext->interrupt_mode = irq_mode; | ||
291 | 299 | ||
292 | /* Allocate child services if any */ | 300 | /* Allocate child services if any */ |
293 | for (i = 0; i < PCIE_PORT_DEVICE_MAXSERVICES; i++) { | 301 | for (i = 0; i < PCIE_PORT_DEVICE_MAXSERVICES; i++) { |
diff --git a/drivers/pci/pcie/portdrv_pci.c b/drivers/pci/pcie/portdrv_pci.c index e9095ee508e3..30bac7ed7c16 100644 --- a/drivers/pci/pcie/portdrv_pci.c +++ b/drivers/pci/pcie/portdrv_pci.c | |||
@@ -29,6 +29,78 @@ MODULE_LICENSE("GPL"); | |||
29 | /* global data */ | 29 | /* global data */ |
30 | static const char device_name[] = "pcieport-driver"; | 30 | static const char device_name[] = "pcieport-driver"; |
31 | 31 | ||
32 | static void pci_save_msi_state(struct pci_dev *dev) | ||
33 | { | ||
34 | struct pcie_port_device_ext *p_ext = pci_get_drvdata(dev); | ||
35 | int i = 0, pos; | ||
36 | u16 control; | ||
37 | |||
38 | if ((pos = pci_find_capability(dev, PCI_CAP_ID_MSI)) <= 0) | ||
39 | return; | ||
40 | |||
41 | pci_read_config_dword(dev, pos, &p_ext->saved_msi_config_space[i++]); | ||
42 | control = p_ext->saved_msi_config_space[0] >> 16; | ||
43 | pci_read_config_dword(dev, pos + PCI_MSI_ADDRESS_LO, | ||
44 | &p_ext->saved_msi_config_space[i++]); | ||
45 | if (control & PCI_MSI_FLAGS_64BIT) { | ||
46 | pci_read_config_dword(dev, pos + PCI_MSI_ADDRESS_HI, | ||
47 | &p_ext->saved_msi_config_space[i++]); | ||
48 | pci_read_config_dword(dev, pos + PCI_MSI_DATA_64, | ||
49 | &p_ext->saved_msi_config_space[i++]); | ||
50 | } else | ||
51 | pci_read_config_dword(dev, pos + PCI_MSI_DATA_32, | ||
52 | &p_ext->saved_msi_config_space[i++]); | ||
53 | if (control & PCI_MSI_FLAGS_MASKBIT) | ||
54 | pci_read_config_dword(dev, pos + PCI_MSI_MASK_BIT, | ||
55 | &p_ext->saved_msi_config_space[i++]); | ||
56 | } | ||
57 | |||
58 | static void pci_restore_msi_state(struct pci_dev *dev) | ||
59 | { | ||
60 | struct pcie_port_device_ext *p_ext = pci_get_drvdata(dev); | ||
61 | int i = 0, pos; | ||
62 | u16 control; | ||
63 | |||
64 | if ((pos = pci_find_capability(dev, PCI_CAP_ID_MSI)) <= 0) | ||
65 | return; | ||
66 | |||
67 | control = p_ext->saved_msi_config_space[i++] >> 16; | ||
68 | pci_write_config_word(dev, pos + PCI_MSI_FLAGS, control); | ||
69 | pci_write_config_dword(dev, pos + PCI_MSI_ADDRESS_LO, | ||
70 | p_ext->saved_msi_config_space[i++]); | ||
71 | if (control & PCI_MSI_FLAGS_64BIT) { | ||
72 | pci_write_config_dword(dev, pos + PCI_MSI_ADDRESS_HI, | ||
73 | p_ext->saved_msi_config_space[i++]); | ||
74 | pci_write_config_dword(dev, pos + PCI_MSI_DATA_64, | ||
75 | p_ext->saved_msi_config_space[i++]); | ||
76 | } else | ||
77 | pci_write_config_dword(dev, pos + PCI_MSI_DATA_32, | ||
78 | p_ext->saved_msi_config_space[i++]); | ||
79 | if (control & PCI_MSI_FLAGS_MASKBIT) | ||
80 | pci_write_config_dword(dev, pos + PCI_MSI_MASK_BIT, | ||
81 | p_ext->saved_msi_config_space[i++]); | ||
82 | } | ||
83 | |||
84 | static void pcie_portdrv_save_config(struct pci_dev *dev) | ||
85 | { | ||
86 | struct pcie_port_device_ext *p_ext = pci_get_drvdata(dev); | ||
87 | |||
88 | pci_save_state(dev); | ||
89 | if (p_ext->interrupt_mode == PCIE_PORT_MSI_MODE) | ||
90 | pci_save_msi_state(dev); | ||
91 | } | ||
92 | |||
93 | static void pcie_portdrv_restore_config(struct pci_dev *dev) | ||
94 | { | ||
95 | struct pcie_port_device_ext *p_ext = pci_get_drvdata(dev); | ||
96 | |||
97 | pci_restore_state(dev); | ||
98 | if (p_ext->interrupt_mode == PCIE_PORT_MSI_MODE) | ||
99 | pci_restore_msi_state(dev); | ||
100 | pci_enable_device(dev); | ||
101 | pci_set_master(dev); | ||
102 | } | ||
103 | |||
32 | /* | 104 | /* |
33 | * pcie_portdrv_probe - Probe PCI-Express port devices | 105 | * pcie_portdrv_probe - Probe PCI-Express port devices |
34 | * @dev: PCI-Express port device being probed | 106 | * @dev: PCI-Express port device being probed |
@@ -64,16 +136,21 @@ static int __devinit pcie_portdrv_probe (struct pci_dev *dev, | |||
64 | static void pcie_portdrv_remove (struct pci_dev *dev) | 136 | static void pcie_portdrv_remove (struct pci_dev *dev) |
65 | { | 137 | { |
66 | pcie_port_device_remove(dev); | 138 | pcie_port_device_remove(dev); |
139 | kfree(pci_get_drvdata(dev)); | ||
67 | } | 140 | } |
68 | 141 | ||
69 | #ifdef CONFIG_PM | 142 | #ifdef CONFIG_PM |
70 | static int pcie_portdrv_suspend (struct pci_dev *dev, pm_message_t state) | 143 | static int pcie_portdrv_suspend (struct pci_dev *dev, pm_message_t state) |
71 | { | 144 | { |
72 | return pcie_port_device_suspend(dev, state); | 145 | int ret = pcie_port_device_suspend(dev, state); |
146 | |||
147 | pcie_portdrv_save_config(dev); | ||
148 | return ret; | ||
73 | } | 149 | } |
74 | 150 | ||
75 | static int pcie_portdrv_resume (struct pci_dev *dev) | 151 | static int pcie_portdrv_resume (struct pci_dev *dev) |
76 | { | 152 | { |
153 | pcie_portdrv_restore_config(dev); | ||
77 | return pcie_port_device_resume(dev); | 154 | return pcie_port_device_resume(dev); |
78 | } | 155 | } |
79 | #endif | 156 | #endif |
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 6a0a82f0508b..df3bdae2040f 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c | |||
@@ -239,9 +239,8 @@ void __devinit pci_read_bridge_bases(struct pci_bus *child) | |||
239 | 239 | ||
240 | if (dev->transparent) { | 240 | if (dev->transparent) { |
241 | printk(KERN_INFO "PCI: Transparent bridge - %s\n", pci_name(dev)); | 241 | printk(KERN_INFO "PCI: Transparent bridge - %s\n", pci_name(dev)); |
242 | for(i = 0; i < PCI_BUS_NUM_RESOURCES; i++) | 242 | for(i = 3; i < PCI_BUS_NUM_RESOURCES; i++) |
243 | child->resource[i] = child->parent->resource[i]; | 243 | child->resource[i] = child->parent->resource[i - 3]; |
244 | return; | ||
245 | } | 244 | } |
246 | 245 | ||
247 | for(i=0; i<3; i++) | 246 | for(i=0; i<3; i++) |
@@ -398,6 +397,16 @@ static void pci_enable_crs(struct pci_dev *dev) | |||
398 | pci_write_config_word(dev, rpcap + PCI_EXP_RTCTL, rpctl); | 397 | pci_write_config_word(dev, rpcap + PCI_EXP_RTCTL, rpctl); |
399 | } | 398 | } |
400 | 399 | ||
400 | static void __devinit pci_fixup_parent_subordinate_busnr(struct pci_bus *child, int max) | ||
401 | { | ||
402 | struct pci_bus *parent = child->parent; | ||
403 | while (parent->parent && parent->subordinate < max) { | ||
404 | parent->subordinate = max; | ||
405 | pci_write_config_byte(parent->self, PCI_SUBORDINATE_BUS, max); | ||
406 | parent = parent->parent; | ||
407 | } | ||
408 | } | ||
409 | |||
401 | unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus); | 410 | unsigned int __devinit pci_scan_child_bus(struct pci_bus *bus); |
402 | 411 | ||
403 | /* | 412 | /* |
@@ -499,7 +508,13 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max | |||
499 | 508 | ||
500 | if (!is_cardbus) { | 509 | if (!is_cardbus) { |
501 | child->bridge_ctl = PCI_BRIDGE_CTL_NO_ISA; | 510 | child->bridge_ctl = PCI_BRIDGE_CTL_NO_ISA; |
502 | 511 | /* | |
512 | * Adjust subordinate busnr in parent buses. | ||
513 | * We do this before scanning for children because | ||
514 | * some devices may not be detected if the bios | ||
515 | * was lazy. | ||
516 | */ | ||
517 | pci_fixup_parent_subordinate_busnr(child, max); | ||
503 | /* Now we can scan all subordinate buses... */ | 518 | /* Now we can scan all subordinate buses... */ |
504 | max = pci_scan_child_bus(child); | 519 | max = pci_scan_child_bus(child); |
505 | } else { | 520 | } else { |
@@ -513,6 +528,7 @@ int __devinit pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max | |||
513 | max+i+1)) | 528 | max+i+1)) |
514 | break; | 529 | break; |
515 | max += i; | 530 | max += i; |
531 | pci_fixup_parent_subordinate_busnr(child, max); | ||
516 | } | 532 | } |
517 | /* | 533 | /* |
518 | * Set the subordinate bus number to its real value. | 534 | * Set the subordinate bus number to its real value. |
diff --git a/drivers/pci/quirks.c b/drivers/pci/quirks.c index 968033fd29f0..1521fd5d95cc 100644 --- a/drivers/pci/quirks.c +++ b/drivers/pci/quirks.c | |||
@@ -767,6 +767,7 @@ static void __init asus_hides_smbus_hostbridge(struct pci_dev *dev) | |||
767 | if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_ASUSTEK)) { | 767 | if (unlikely(dev->subsystem_vendor == PCI_VENDOR_ID_ASUSTEK)) { |
768 | if (dev->device == PCI_DEVICE_ID_INTEL_82845_HB) | 768 | if (dev->device == PCI_DEVICE_ID_INTEL_82845_HB) |
769 | switch(dev->subsystem_device) { | 769 | switch(dev->subsystem_device) { |
770 | case 0x8025: /* P4B-LX */ | ||
770 | case 0x8070: /* P4B */ | 771 | case 0x8070: /* P4B */ |
771 | case 0x8088: /* P4B533 */ | 772 | case 0x8088: /* P4B533 */ |
772 | case 0x1626: /* L3C notebook */ | 773 | case 0x1626: /* L3C notebook */ |
diff --git a/drivers/pci/setup-bus.c b/drivers/pci/setup-bus.c index 6b628de948af..c1bdfb424658 100644 --- a/drivers/pci/setup-bus.c +++ b/drivers/pci/setup-bus.c | |||
@@ -273,6 +273,8 @@ find_free_bus_resource(struct pci_bus *bus, unsigned long type) | |||
273 | 273 | ||
274 | for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) { | 274 | for (i = 0; i < PCI_BUS_NUM_RESOURCES; i++) { |
275 | r = bus->resource[i]; | 275 | r = bus->resource[i]; |
276 | if (r == &ioport_resource || r == &iomem_resource) | ||
277 | continue; | ||
276 | if (r && (r->flags & type_mask) == type && !r->parent) | 278 | if (r && (r->flags & type_mask) == type && !r->parent) |
277 | return r; | 279 | return r; |
278 | } | 280 | } |
diff --git a/include/linux/pci-dynids.h b/include/linux/pci-dynids.h deleted file mode 100644 index 183b6b0de81c..000000000000 --- a/include/linux/pci-dynids.h +++ /dev/null | |||
@@ -1,18 +0,0 @@ | |||
1 | /* | ||
2 | * PCI defines and function prototypes | ||
3 | * Copyright 2003 Dell Inc. | ||
4 | * by Matt Domsch <Matt_Domsch@dell.com> | ||
5 | */ | ||
6 | |||
7 | #ifndef LINUX_PCI_DYNIDS_H | ||
8 | #define LINUX_PCI_DYNIDS_H | ||
9 | |||
10 | #include <linux/list.h> | ||
11 | #include <linux/mod_devicetable.h> | ||
12 | |||
13 | struct dynid { | ||
14 | struct list_head node; | ||
15 | struct pci_device_id id; | ||
16 | }; | ||
17 | |||
18 | #endif | ||
diff --git a/include/linux/pci.h b/include/linux/pci.h index 66798b46f308..7ac14961ba22 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h | |||
@@ -586,7 +586,7 @@ struct pci_dev { | |||
586 | #define PCI_NUM_RESOURCES 11 | 586 | #define PCI_NUM_RESOURCES 11 |
587 | 587 | ||
588 | #ifndef PCI_BUS_NUM_RESOURCES | 588 | #ifndef PCI_BUS_NUM_RESOURCES |
589 | #define PCI_BUS_NUM_RESOURCES 4 | 589 | #define PCI_BUS_NUM_RESOURCES 8 |
590 | #endif | 590 | #endif |
591 | 591 | ||
592 | #define PCI_REGION_FLAG_MASK 0x0fU /* These bits of resource flags tell us the PCI region flags */ | 592 | #define PCI_REGION_FLAG_MASK 0x0fU /* These bits of resource flags tell us the PCI region flags */ |
@@ -860,7 +860,8 @@ int pci_register_driver(struct pci_driver *); | |||
860 | void pci_unregister_driver(struct pci_driver *); | 860 | void pci_unregister_driver(struct pci_driver *); |
861 | void pci_remove_behind_bridge(struct pci_dev *); | 861 | void pci_remove_behind_bridge(struct pci_dev *); |
862 | struct pci_driver *pci_dev_driver(const struct pci_dev *); | 862 | struct pci_driver *pci_dev_driver(const struct pci_dev *); |
863 | const struct pci_device_id *pci_match_device(const struct pci_device_id *ids, const struct pci_dev *dev); | 863 | const struct pci_device_id *pci_match_device(struct pci_driver *drv, struct pci_dev *dev); |
864 | const struct pci_device_id *pci_match_id(const struct pci_device_id *ids, struct pci_dev *dev); | ||
864 | int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass); | 865 | int pci_scan_bridge(struct pci_bus *bus, struct pci_dev * dev, int max, int pass); |
865 | 866 | ||
866 | /* kmem_cache style wrapper around pci_alloc_consistent() */ | 867 | /* kmem_cache style wrapper around pci_alloc_consistent() */ |
diff --git a/sound/pci/bt87x.c b/sound/pci/bt87x.c index defdc5a459f0..909fef8903cb 100644 --- a/sound/pci/bt87x.c +++ b/sound/pci/bt87x.c | |||
@@ -804,7 +804,7 @@ static int __devinit snd_bt87x_detect_card(struct pci_dev *pci) | |||
804 | int i; | 804 | int i; |
805 | const struct pci_device_id *supported; | 805 | const struct pci_device_id *supported; |
806 | 806 | ||
807 | supported = pci_match_device(snd_bt87x_ids, pci); | 807 | supported = pci_match_device(driver, pci); |
808 | if (supported) | 808 | if (supported) |
809 | return supported->driver_data; | 809 | return supported->driver_data; |
810 | 810 | ||