summaryrefslogtreecommitdiff
path: root/drivers/staging/vme/bridges/vme_ca91cx42.c
diff options
context:
space:
mode:
authorMartyn Welch <martyn.welch@ge.com>2010-03-22 14:58:57 (GMT)
committerGreg Kroah-Hartman <gregkh@suse.de>2010-05-11 18:35:52 (GMT)
commit7946328faf1dca9bfadf98f4579f95aafffaba0f (patch)
tree86019b3e4bba0457320342cb8a87f3cc333e4fb9 /drivers/staging/vme/bridges/vme_ca91cx42.c
parent48d9356e7750d3efa3156eb3a76e7a4439774b12 (diff)
downloadlinux-fsl-qoriq-7946328faf1dca9bfadf98f4579f95aafffaba0f.tar.xz
Staging: vme: Correct checkpatch errors
Correct numerous checkpatch errors in the vme driver. Signed-off-by: Martyn Welch <martyn.welch@ge.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/vme/bridges/vme_ca91cx42.c')
-rw-r--r--drivers/staging/vme/bridges/vme_ca91cx42.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/staging/vme/bridges/vme_ca91cx42.c b/drivers/staging/vme/bridges/vme_ca91cx42.c
index 589664c..b9f986b 100644
--- a/drivers/staging/vme/bridges/vme_ca91cx42.c
+++ b/drivers/staging/vme/bridges/vme_ca91cx42.c
@@ -26,9 +26,9 @@
#include <linux/spinlock.h>
#include <linux/sched.h>
#include <linux/slab.h>
-#include <asm/time.h>
-#include <asm/io.h>
-#include <asm/uaccess.h>
+#include <linux/time.h>
+#include <linux/io.h>
+#include <linux/uaccess.h>
#include "../vme.h"
#include "../vme_bridge.h"
@@ -1684,9 +1684,8 @@ static int ca91cx42_probe(struct pci_dev *pdev, const struct pci_device_id *id)
dev_info(&pdev->dev, "Slot ID is %d\n",
ca91cx42_slot_get(ca91cx42_bridge));
- if (ca91cx42_crcsr_init(ca91cx42_bridge, pdev)) {
+ if (ca91cx42_crcsr_init(ca91cx42_bridge, pdev))
dev_err(&pdev->dev, "CR/CSR configuration failed.\n");
- }
/* Need to save ca91cx42_bridge pointer locally in link list for use in
* ca91cx42_remove()