diff options
author | Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> | 2009-09-07 04:07:29 -0400 |
---|---|---|
committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-09-09 16:46:18 -0400 |
commit | c9a918838c07cbef934c8ef818d8f0e719015c3a (patch) | |
tree | fa0978d67632a15fdd014f448ac099ab1ec8df75 /drivers/pci/pcie/aer/aerdrv.c | |
parent | b439b1d4e3ae3c36ed94ed233119ff0d145af257 (diff) |
PCI: pcie, aer: checkpatch style cleanup in pcie/aer/*
Before:
drivers/pci/pcie/aer/aer_inject.c
total: 4 errors, 4 warnings, 473 lines checked
drivers/pci/pcie/aer/aerdrv.c
total: 5 errors, 2 warnings, 333 lines checked
drivers/pci/pcie/aer/aerdrv.h
total: 1 errors, 0 warnings, 139 lines checked
drivers/pci/pcie/aer/aerdrv_core.c
total: 4 errors, 3 warnings, 872 lines checked
drivers/pci/pcie/aer/aerdrv_errprint.c
total: 12 errors, 11 warnings, 248 lines checked
After:
drivers/pci/pcie/aer/aer_inject.c
total: 0 errors, 0 warnings, 466 lines checked
drivers/pci/pcie/aer/aerdrv.c
total: 0 errors, 0 warnings, 335 lines checked
drivers/pci/pcie/aer/aerdrv.h
total: 0 errors, 0 warnings, 139 lines checked
drivers/pci/pcie/aer/aerdrv_core.c
total: 0 errors, 0 warnings, 869 lines checked
drivers/pci/pcie/aer/aerdrv_errprint.c
total: 0 errors, 10 warnings, 247 lines checked
Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>
Reviewed-by: Andrew Patterson <andrew.patterson@hp.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/pcie/aer/aerdrv.c')
-rw-r--r-- | drivers/pci/pcie/aer/aerdrv.c | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/drivers/pci/pcie/aer/aerdrv.c b/drivers/pci/pcie/aer/aerdrv.c index 4770f13b3ca1..10c0e62bd5a8 100644 --- a/drivers/pci/pcie/aer/aerdrv.c +++ b/drivers/pci/pcie/aer/aerdrv.c | |||
@@ -38,7 +38,7 @@ MODULE_AUTHOR(DRIVER_AUTHOR); | |||
38 | MODULE_DESCRIPTION(DRIVER_DESC); | 38 | MODULE_DESCRIPTION(DRIVER_DESC); |
39 | MODULE_LICENSE("GPL"); | 39 | MODULE_LICENSE("GPL"); |
40 | 40 | ||
41 | static int __devinit aer_probe (struct pcie_device *dev); | 41 | static int __devinit aer_probe(struct pcie_device *dev); |
42 | static void aer_remove(struct pcie_device *dev); | 42 | static void aer_remove(struct pcie_device *dev); |
43 | static pci_ers_result_t aer_error_detected(struct pci_dev *dev, | 43 | static pci_ers_result_t aer_error_detected(struct pci_dev *dev, |
44 | enum pci_channel_state error); | 44 | enum pci_channel_state error); |
@@ -47,7 +47,7 @@ static pci_ers_result_t aer_root_reset(struct pci_dev *dev); | |||
47 | 47 | ||
48 | static struct pci_error_handlers aer_error_handlers = { | 48 | static struct pci_error_handlers aer_error_handlers = { |
49 | .error_detected = aer_error_detected, | 49 | .error_detected = aer_error_detected, |
50 | .resume = aer_error_resume, | 50 | .resume = aer_error_resume, |
51 | }; | 51 | }; |
52 | 52 | ||
53 | static struct pcie_port_service_driver aerdriver = { | 53 | static struct pcie_port_service_driver aerdriver = { |
@@ -134,12 +134,12 @@ EXPORT_SYMBOL_GPL(aer_irq); | |||
134 | * | 134 | * |
135 | * Invoked when Root Port's AER service is loaded. | 135 | * Invoked when Root Port's AER service is loaded. |
136 | **/ | 136 | **/ |
137 | static struct aer_rpc* aer_alloc_rpc(struct pcie_device *dev) | 137 | static struct aer_rpc *aer_alloc_rpc(struct pcie_device *dev) |
138 | { | 138 | { |
139 | struct aer_rpc *rpc; | 139 | struct aer_rpc *rpc; |
140 | 140 | ||
141 | if (!(rpc = kzalloc(sizeof(struct aer_rpc), | 141 | rpc = kzalloc(sizeof(struct aer_rpc), GFP_KERNEL); |
142 | GFP_KERNEL))) | 142 | if (!rpc) |
143 | return NULL; | 143 | return NULL; |
144 | 144 | ||
145 | /* | 145 | /* |
@@ -189,26 +189,28 @@ static void aer_remove(struct pcie_device *dev) | |||
189 | * | 189 | * |
190 | * Invoked when PCI Express bus loads AER service driver. | 190 | * Invoked when PCI Express bus loads AER service driver. |
191 | **/ | 191 | **/ |
192 | static int __devinit aer_probe (struct pcie_device *dev) | 192 | static int __devinit aer_probe(struct pcie_device *dev) |
193 | { | 193 | { |
194 | int status; | 194 | int status; |
195 | struct aer_rpc *rpc; | 195 | struct aer_rpc *rpc; |
196 | struct device *device = &dev->device; | 196 | struct device *device = &dev->device; |
197 | 197 | ||
198 | /* Init */ | 198 | /* Init */ |
199 | if ((status = aer_init(dev))) | 199 | status = aer_init(dev); |
200 | if (status) | ||
200 | return status; | 201 | return status; |
201 | 202 | ||
202 | /* Alloc rpc data structure */ | 203 | /* Alloc rpc data structure */ |
203 | if (!(rpc = aer_alloc_rpc(dev))) { | 204 | rpc = aer_alloc_rpc(dev); |
205 | if (!rpc) { | ||
204 | dev_printk(KERN_DEBUG, device, "alloc rpc failed\n"); | 206 | dev_printk(KERN_DEBUG, device, "alloc rpc failed\n"); |
205 | aer_remove(dev); | 207 | aer_remove(dev); |
206 | return -ENOMEM; | 208 | return -ENOMEM; |
207 | } | 209 | } |
208 | 210 | ||
209 | /* Request IRQ ISR */ | 211 | /* Request IRQ ISR */ |
210 | if ((status = request_irq(dev->irq, aer_irq, IRQF_SHARED, "aerdrv", | 212 | status = request_irq(dev->irq, aer_irq, IRQF_SHARED, "aerdrv", dev); |
211 | dev))) { | 213 | if (status) { |
212 | dev_printk(KERN_DEBUG, device, "request IRQ failed\n"); | 214 | dev_printk(KERN_DEBUG, device, "request IRQ failed\n"); |
213 | aer_remove(dev); | 215 | aer_remove(dev); |
214 | return status; | 216 | return status; |