aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/edac/edac_pci.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/edac/edac_pci.c')
-rw-r--r--drivers/edac/edac_pci.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/drivers/edac/edac_pci.c b/drivers/edac/edac_pci.c
index ac16b434a3c5..f4f718c764db 100644
--- a/drivers/edac/edac_pci.c
+++ b/drivers/edac/edac_pci.c
@@ -47,7 +47,7 @@ static inline void edac_unlock_pci_list(void)
47 * edac_pci it is going to control/register with the EDAC CORE. 47 * edac_pci it is going to control/register with the EDAC CORE.
48 */ 48 */
49struct edac_pci_ctl_info *edac_pci_alloc_ctl_info(unsigned int sz_pvt, 49struct edac_pci_ctl_info *edac_pci_alloc_ctl_info(unsigned int sz_pvt,
50 const char *edac_pci_name) 50 const char *edac_pci_name)
51{ 51{
52 struct edac_pci_ctl_info *pci; 52 struct edac_pci_ctl_info *pci;
53 void *pvt; 53 void *pvt;
@@ -140,18 +140,18 @@ static int add_edac_pci_to_global_list(struct edac_pci_ctl_info *pci)
140 list_add_tail_rcu(&pci->link, insert_before); 140 list_add_tail_rcu(&pci->link, insert_before);
141 return 0; 141 return 0;
142 142
143 fail0: 143fail0:
144 edac_printk(KERN_WARNING, EDAC_PCI, 144 edac_printk(KERN_WARNING, EDAC_PCI,
145 "%s (%s) %s %s already assigned %d\n", 145 "%s (%s) %s %s already assigned %d\n",
146 rover->dev->bus_id, dev_name(rover), 146 rover->dev->bus_id, dev_name(rover),
147 rover->mod_name, rover->ctl_name, rover->pci_idx); 147 rover->mod_name, rover->ctl_name, rover->pci_idx);
148 return 1; 148 return 1;
149 149
150 fail1: 150fail1:
151 edac_printk(KERN_WARNING, EDAC_PCI, 151 edac_printk(KERN_WARNING, EDAC_PCI,
152 "but in low-level driver: attempt to assign\n" 152 "but in low-level driver: attempt to assign\n"
153 "\tduplicate pci_idx %d in %s()\n", rover->pci_idx, 153 "\tduplicate pci_idx %d in %s()\n", rover->pci_idx,
154 __func__); 154 __func__);
155 return 1; 155 return 1;
156} 156}
157 157
@@ -222,14 +222,14 @@ static void edac_pci_workq_function(struct work_struct *work_req)
222 edac_lock_pci_list(); 222 edac_lock_pci_list();
223 223
224 if ((pci->op_state == OP_RUNNING_POLL) && 224 if ((pci->op_state == OP_RUNNING_POLL) &&
225 (pci->edac_check != NULL) && (edac_pci_get_check_errors())) 225 (pci->edac_check != NULL) && (edac_pci_get_check_errors()))
226 pci->edac_check(pci); 226 pci->edac_check(pci);
227 227
228 edac_unlock_pci_list(); 228 edac_unlock_pci_list();
229 229
230 /* Reschedule */ 230 /* Reschedule */
231 queue_delayed_work(edac_workqueue, &pci->work, 231 queue_delayed_work(edac_workqueue, &pci->work,
232 msecs_to_jiffies(edac_pci_get_poll_msec())); 232 msecs_to_jiffies(edac_pci_get_poll_msec()));
233} 233}
234 234
235/* 235/*
@@ -244,7 +244,7 @@ static void edac_pci_workq_setup(struct edac_pci_ctl_info *pci,
244 244
245 INIT_DELAYED_WORK(&pci->work, edac_pci_workq_function); 245 INIT_DELAYED_WORK(&pci->work, edac_pci_workq_function);
246 queue_delayed_work(edac_workqueue, &pci->work, 246 queue_delayed_work(edac_workqueue, &pci->work,
247 msecs_to_jiffies(edac_pci_get_poll_msec())); 247 msecs_to_jiffies(edac_pci_get_poll_msec()));
248} 248}
249 249
250/* 250/*
@@ -326,9 +326,9 @@ int edac_pci_add_device(struct edac_pci_ctl_info *pci, int edac_idx)
326 edac_unlock_pci_list(); 326 edac_unlock_pci_list();
327 return 0; 327 return 0;
328 328
329 fail1: 329fail1:
330 del_edac_pci_from_global_list(pci); 330 del_edac_pci_from_global_list(pci);
331 fail0: 331fail0:
332 edac_unlock_pci_list(); 332 edac_unlock_pci_list();
333 return 1; 333 return 1;
334} 334}
@@ -372,8 +372,8 @@ struct edac_pci_ctl_info *edac_pci_del_device(struct device *dev)
372 edac_unlock_pci_list(); 372 edac_unlock_pci_list();
373 373
374 edac_printk(KERN_INFO, EDAC_PCI, 374 edac_printk(KERN_INFO, EDAC_PCI,
375 "Removed device %d for %s %s: DEV %s\n", 375 "Removed device %d for %s %s: DEV %s\n",
376 pci->pci_idx, pci->mod_name, pci->ctl_name, dev_name(pci)); 376 pci->pci_idx, pci->mod_name, pci->ctl_name, dev_name(pci));
377 377
378 return pci; 378 return pci;
379} 379}
@@ -393,7 +393,7 @@ struct edac_pci_gen_data {
393}; 393};
394 394
395struct edac_pci_ctl_info *edac_pci_create_generic_ctl(struct device *dev, 395struct edac_pci_ctl_info *edac_pci_create_generic_ctl(struct device *dev,
396 const char *mod_name) 396 const char *mod_name)
397{ 397{
398 struct edac_pci_ctl_info *pci; 398 struct edac_pci_ctl_info *pci;
399 struct edac_pci_gen_data *pdata; 399 struct edac_pci_gen_data *pdata;