.. | .. |
---|
49 | 49 | slot->number); |
---|
50 | 50 | } |
---|
51 | 51 | |
---|
52 | | -/* these strings match up with the values in pci_bus_speed */ |
---|
53 | | -static const char *pci_bus_speed_strings[] = { |
---|
54 | | - "33 MHz PCI", /* 0x00 */ |
---|
55 | | - "66 MHz PCI", /* 0x01 */ |
---|
56 | | - "66 MHz PCI-X", /* 0x02 */ |
---|
57 | | - "100 MHz PCI-X", /* 0x03 */ |
---|
58 | | - "133 MHz PCI-X", /* 0x04 */ |
---|
59 | | - NULL, /* 0x05 */ |
---|
60 | | - NULL, /* 0x06 */ |
---|
61 | | - NULL, /* 0x07 */ |
---|
62 | | - NULL, /* 0x08 */ |
---|
63 | | - "66 MHz PCI-X 266", /* 0x09 */ |
---|
64 | | - "100 MHz PCI-X 266", /* 0x0a */ |
---|
65 | | - "133 MHz PCI-X 266", /* 0x0b */ |
---|
66 | | - "Unknown AGP", /* 0x0c */ |
---|
67 | | - "1x AGP", /* 0x0d */ |
---|
68 | | - "2x AGP", /* 0x0e */ |
---|
69 | | - "4x AGP", /* 0x0f */ |
---|
70 | | - "8x AGP", /* 0x10 */ |
---|
71 | | - "66 MHz PCI-X 533", /* 0x11 */ |
---|
72 | | - "100 MHz PCI-X 533", /* 0x12 */ |
---|
73 | | - "133 MHz PCI-X 533", /* 0x13 */ |
---|
74 | | - "2.5 GT/s PCIe", /* 0x14 */ |
---|
75 | | - "5.0 GT/s PCIe", /* 0x15 */ |
---|
76 | | - "8.0 GT/s PCIe", /* 0x16 */ |
---|
77 | | - "16.0 GT/s PCIe", /* 0x17 */ |
---|
78 | | -}; |
---|
79 | | - |
---|
80 | 52 | static ssize_t bus_speed_read(enum pci_bus_speed speed, char *buf) |
---|
81 | 53 | { |
---|
82 | | - const char *speed_string; |
---|
83 | | - |
---|
84 | | - if (speed < ARRAY_SIZE(pci_bus_speed_strings)) |
---|
85 | | - speed_string = pci_bus_speed_strings[speed]; |
---|
86 | | - else |
---|
87 | | - speed_string = "Unknown"; |
---|
88 | | - |
---|
89 | | - return sprintf(buf, "%s\n", speed_string); |
---|
| 54 | + return sprintf(buf, "%s\n", pci_speed_string(speed)); |
---|
90 | 55 | } |
---|
91 | 56 | |
---|
92 | 57 | static ssize_t max_speed_read_file(struct pci_slot *slot, char *buf) |
---|
.. | .. |
---|
372 | 337 | |
---|
373 | 338 | if (!slot || !slot->ops) |
---|
374 | 339 | return; |
---|
375 | | - kobj = kset_find_obj(module_kset, slot->ops->mod_name); |
---|
| 340 | + kobj = kset_find_obj(module_kset, slot->mod_name); |
---|
376 | 341 | if (!kobj) |
---|
377 | 342 | return; |
---|
378 | 343 | ret = sysfs_create_link(&pci_slot->kobj, kobj, "module"); |
---|
.. | .. |
---|
405 | 370 | pci_slots_kset = kset_create_and_add("slots", NULL, |
---|
406 | 371 | &pci_bus_kset->kobj); |
---|
407 | 372 | if (!pci_slots_kset) { |
---|
408 | | - printk(KERN_ERR "PCI: Slot initialization failure\n"); |
---|
| 373 | + pr_err("PCI: Slot initialization failure\n"); |
---|
409 | 374 | return -ENOMEM; |
---|
410 | 375 | } |
---|
411 | 376 | return 0; |
---|