| .. | .. |
|---|
| 152 | 152 | { |
|---|
| 153 | 153 | struct ohci_hcd *ohci = hcd_to_ohci(hcd); |
|---|
| 154 | 154 | |
|---|
| 155 | | - if (usb_amd_find_chipset_info()) |
|---|
| 155 | + if (usb_amd_quirk_pll_check()) |
|---|
| 156 | 156 | ohci->flags |= OHCI_QUIRK_AMD_PLL; |
|---|
| 157 | 157 | |
|---|
| 158 | 158 | /* SB800 needs pre-fetch fix */ |
|---|
| .. | .. |
|---|
| 232 | 232 | .driver_data = (unsigned long)ohci_quirk_qemu, |
|---|
| 233 | 233 | }, |
|---|
| 234 | 234 | |
|---|
| 235 | | - /* FIXME for some of the early AMD 760 southbridges, OHCI |
|---|
| 236 | | - * won't work at all. blacklist them. |
|---|
| 237 | | - */ |
|---|
| 238 | | - |
|---|
| 239 | 235 | {}, |
|---|
| 240 | 236 | }; |
|---|
| 241 | 237 | |
|---|
| .. | .. |
|---|
| 274 | 270 | .reset = ohci_pci_reset, |
|---|
| 275 | 271 | }; |
|---|
| 276 | 272 | |
|---|
| 277 | | -static const struct pci_device_id pci_ids [] = { { |
|---|
| 273 | +static const struct pci_device_id pci_ids[] = { { |
|---|
| 278 | 274 | /* handle any USB OHCI controller */ |
|---|
| 279 | 275 | PCI_DEVICE_CLASS(PCI_CLASS_SERIAL_USB_OHCI, ~0), |
|---|
| 280 | | - .driver_data = (unsigned long) &ohci_pci_hc_driver, |
|---|
| 281 | 276 | }, { |
|---|
| 282 | 277 | /* The device in the ConneXT I/O hub has no class reg */ |
|---|
| 283 | 278 | PCI_VDEVICE(STMICRO, PCI_DEVICE_ID_STMICRO_USB_OHCI), |
|---|
| 284 | | - .driver_data = (unsigned long) &ohci_pci_hc_driver, |
|---|
| 285 | 279 | }, { /* end: all zeroes */ } |
|---|
| 286 | 280 | }; |
|---|
| 287 | 281 | MODULE_DEVICE_TABLE (pci, pci_ids); |
|---|
| 288 | 282 | |
|---|
| 283 | +static int ohci_pci_probe(struct pci_dev *dev, const struct pci_device_id *id) |
|---|
| 284 | +{ |
|---|
| 285 | + return usb_hcd_pci_probe(dev, id, &ohci_pci_hc_driver); |
|---|
| 286 | +} |
|---|
| 287 | + |
|---|
| 289 | 288 | /* pci driver glue; this is a "new style" PCI driver module */ |
|---|
| 290 | 289 | static struct pci_driver ohci_pci_driver = { |
|---|
| 291 | | - .name = (char *) hcd_name, |
|---|
| 290 | + .name = hcd_name, |
|---|
| 292 | 291 | .id_table = pci_ids, |
|---|
| 293 | 292 | |
|---|
| 294 | | - .probe = usb_hcd_pci_probe, |
|---|
| 293 | + .probe = ohci_pci_probe, |
|---|
| 295 | 294 | .remove = usb_hcd_pci_remove, |
|---|
| 296 | 295 | .shutdown = usb_hcd_pci_shutdown, |
|---|
| 297 | 296 | |
|---|