diff options
Diffstat (limited to 'drivers/edac/edac_pci.c')
-rw-r--r-- | drivers/edac/edac_pci.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c index 32be43576a8e..22ec9d5d4312 100644 --- a/drivers/edac/edac_pci.c +++ b/drivers/edac/edac_pci.c | |||
@@ -29,7 +29,7 @@ | |||
29 | #include "edac_module.h" | 29 | #include "edac_module.h" |
30 | 30 | ||
31 | static DEFINE_MUTEX(edac_pci_ctls_mutex); | 31 | static DEFINE_MUTEX(edac_pci_ctls_mutex); |
32 | static struct list_head edac_pci_list = LIST_HEAD_INIT(edac_pci_list); | 32 | static LIST_HEAD(edac_pci_list); |
33 | 33 | ||
34 | /* | 34 | /* |
35 | * edac_pci_alloc_ctl_info | 35 | * edac_pci_alloc_ctl_info |
@@ -150,7 +150,7 @@ static int add_edac_pci_to_global_list(struct edac_pci_ctl_info *pci) | |||
150 | fail0: | 150 | fail0: |
151 | edac_printk(KERN_WARNING, EDAC_PCI, | 151 | edac_printk(KERN_WARNING, EDAC_PCI, |
152 | "%s (%s) %s %s already assigned %d\n", | 152 | "%s (%s) %s %s already assigned %d\n", |
153 | rover->dev->bus_id, dev_name(rover), | 153 | rover->dev->bus_id, edac_dev_name(rover), |
154 | rover->mod_name, rover->ctl_name, rover->pci_idx); | 154 | rover->mod_name, rover->ctl_name, rover->pci_idx); |
155 | return 1; | 155 | return 1; |
156 | 156 | ||
@@ -189,6 +189,9 @@ static void del_edac_pci_from_global_list(struct edac_pci_ctl_info *pci) | |||
189 | wait_for_completion(&pci->complete); | 189 | wait_for_completion(&pci->complete); |
190 | } | 190 | } |
191 | 191 | ||
192 | #if 0 | ||
193 | /* Older code, but might use in the future */ | ||
194 | |||
192 | /* | 195 | /* |
193 | * edac_pci_find() | 196 | * edac_pci_find() |
194 | * Search for an edac_pci_ctl_info structure whose index is 'idx' | 197 | * Search for an edac_pci_ctl_info structure whose index is 'idx' |
@@ -219,6 +222,7 @@ struct edac_pci_ctl_info *edac_pci_find(int idx) | |||
219 | return NULL; | 222 | return NULL; |
220 | } | 223 | } |
221 | EXPORT_SYMBOL_GPL(edac_pci_find); | 224 | EXPORT_SYMBOL_GPL(edac_pci_find); |
225 | #endif | ||
222 | 226 | ||
223 | /* | 227 | /* |
224 | * edac_pci_workq_function() | 228 | * edac_pci_workq_function() |
@@ -356,7 +360,7 @@ int edac_pci_add_device(struct edac_pci_ctl_info *pci, int edac_idx) | |||
356 | " DEV '%s' (%s)\n", | 360 | " DEV '%s' (%s)\n", |
357 | pci->mod_name, | 361 | pci->mod_name, |
358 | pci->ctl_name, | 362 | pci->ctl_name, |
359 | dev_name(pci), edac_op_state_to_string(pci->op_state)); | 363 | edac_dev_name(pci), edac_op_state_to_string(pci->op_state)); |
360 | 364 | ||
361 | mutex_unlock(&edac_pci_ctls_mutex); | 365 | mutex_unlock(&edac_pci_ctls_mutex); |
362 | return 0; | 366 | return 0; |
@@ -411,7 +415,7 @@ struct edac_pci_ctl_info *edac_pci_del_device(struct device *dev) | |||
411 | 415 | ||
412 | edac_printk(KERN_INFO, EDAC_PCI, | 416 | edac_printk(KERN_INFO, EDAC_PCI, |
413 | "Removed device %d for %s %s: DEV %s\n", | 417 | "Removed device %d for %s %s: DEV %s\n", |
414 | pci->pci_idx, pci->mod_name, pci->ctl_name, dev_name(pci)); | 418 | pci->pci_idx, pci->mod_name, pci->ctl_name, edac_dev_name(pci)); |
415 | 419 | ||
416 | return pci; | 420 | return pci; |
417 | } | 421 | } |
@@ -422,7 +426,7 @@ EXPORT_SYMBOL_GPL(edac_pci_del_device); | |||
422 | * | 426 | * |
423 | * a Generic parity check API | 427 | * a Generic parity check API |
424 | */ | 428 | */ |
425 | void edac_pci_generic_check(struct edac_pci_ctl_info *pci) | 429 | static void edac_pci_generic_check(struct edac_pci_ctl_info *pci) |
426 | { | 430 | { |
427 | debugf4("%s()\n", __func__); | 431 | debugf4("%s()\n", __func__); |
428 | edac_pci_do_parity_check(); | 432 | edac_pci_do_parity_check(); |