diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-25 14:25:46 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-25 14:25:46 -0400 |
commit | 25958ce32cd57dd91b42fa414b101d127e818c84 (patch) | |
tree | 2b188d10a7610fdf565ae51f3473798e329e95a0 /drivers/staging/vme/vme.c | |
parent | 8af2c75a328355c23d68d3f8651ad52af3c7979d (diff) |
staging: vme: vme.c: fix minor coding style issues
Fix up some broken printk strings that were spanning multiple lines,
making it hard to search for them.
Cc: Manohar Vanga <manohar.vanga@cern.ch>
Cc: Martyn Welch <martyn.welch@ge.com>
Cc: "Emilio G. Cota" <cota@braap.org>
Cc: Dan Carpenter <error27@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/vme/vme.c')
-rw-r--r-- | drivers/staging/vme/vme.c | 39 |
1 files changed, 15 insertions, 24 deletions
diff --git a/drivers/staging/vme/vme.c b/drivers/staging/vme/vme.c index 70722ae5232..fd51c2d4471 100644 --- a/drivers/staging/vme/vme.c +++ b/drivers/staging/vme/vme.c | |||
@@ -98,14 +98,13 @@ void *vme_alloc_consistent(struct vme_resource *resource, size_t size, | |||
98 | } | 98 | } |
99 | 99 | ||
100 | if (bridge->parent == NULL) { | 100 | if (bridge->parent == NULL) { |
101 | printk(KERN_ERR "Dev entry NULL for" | 101 | printk(KERN_ERR "Dev entry NULL for bridge %s\n", bridge->name); |
102 | " bridge %s\n", bridge->name); | ||
103 | return NULL; | 102 | return NULL; |
104 | } | 103 | } |
105 | 104 | ||
106 | if (bridge->alloc_consistent == NULL) { | 105 | if (bridge->alloc_consistent == NULL) { |
107 | printk(KERN_ERR "alloc_consistent not supported by" | 106 | printk(KERN_ERR "alloc_consistent not supported by bridge %s\n", |
108 | " bridge %s\n", bridge->name); | 107 | bridge->name); |
109 | return NULL; | 108 | return NULL; |
110 | } | 109 | } |
111 | 110 | ||
@@ -133,14 +132,13 @@ void vme_free_consistent(struct vme_resource *resource, size_t size, | |||
133 | } | 132 | } |
134 | 133 | ||
135 | if (bridge->parent == NULL) { | 134 | if (bridge->parent == NULL) { |
136 | printk(KERN_ERR "Dev entry NULL for" | 135 | printk(KERN_ERR "Dev entry NULL for bridge %s\n", bridge->name); |
137 | " bridge %s\n", bridge->name); | ||
138 | return; | 136 | return; |
139 | } | 137 | } |
140 | 138 | ||
141 | if (bridge->free_consistent == NULL) { | 139 | if (bridge->free_consistent == NULL) { |
142 | printk(KERN_ERR "free_consistent not supported by" | 140 | printk(KERN_ERR "free_consistent not supported by bridge %s\n", |
143 | " bridge %s\n", bridge->name); | 141 | bridge->name); |
144 | return; | 142 | return; |
145 | } | 143 | } |
146 | 144 | ||
@@ -747,15 +745,13 @@ struct vme_dma_attr *vme_dma_pattern_attribute(u32 pattern, u32 type) | |||
747 | 745 | ||
748 | attributes = kmalloc(sizeof(struct vme_dma_attr), GFP_KERNEL); | 746 | attributes = kmalloc(sizeof(struct vme_dma_attr), GFP_KERNEL); |
749 | if (attributes == NULL) { | 747 | if (attributes == NULL) { |
750 | printk(KERN_ERR "Unable to allocate memory for attributes " | 748 | printk(KERN_ERR "Unable to allocate memory for attributes structure\n"); |
751 | "structure\n"); | ||
752 | goto err_attr; | 749 | goto err_attr; |
753 | } | 750 | } |
754 | 751 | ||
755 | pattern_attr = kmalloc(sizeof(struct vme_dma_pattern), GFP_KERNEL); | 752 | pattern_attr = kmalloc(sizeof(struct vme_dma_pattern), GFP_KERNEL); |
756 | if (pattern_attr == NULL) { | 753 | if (pattern_attr == NULL) { |
757 | printk(KERN_ERR "Unable to allocate memory for pattern " | 754 | printk(KERN_ERR "Unable to allocate memory for pattern attributes\n"); |
758 | "attributes\n"); | ||
759 | goto err_pat; | 755 | goto err_pat; |
760 | } | 756 | } |
761 | 757 | ||
@@ -786,15 +782,13 @@ struct vme_dma_attr *vme_dma_pci_attribute(dma_addr_t address) | |||
786 | 782 | ||
787 | attributes = kmalloc(sizeof(struct vme_dma_attr), GFP_KERNEL); | 783 | attributes = kmalloc(sizeof(struct vme_dma_attr), GFP_KERNEL); |
788 | if (attributes == NULL) { | 784 | if (attributes == NULL) { |
789 | printk(KERN_ERR "Unable to allocate memory for attributes " | 785 | printk(KERN_ERR "Unable to allocate memory for attributes structure\n"); |
790 | "structure\n"); | ||
791 | goto err_attr; | 786 | goto err_attr; |
792 | } | 787 | } |
793 | 788 | ||
794 | pci_attr = kmalloc(sizeof(struct vme_dma_pci), GFP_KERNEL); | 789 | pci_attr = kmalloc(sizeof(struct vme_dma_pci), GFP_KERNEL); |
795 | if (pci_attr == NULL) { | 790 | if (pci_attr == NULL) { |
796 | printk(KERN_ERR "Unable to allocate memory for pci " | 791 | printk(KERN_ERR "Unable to allocate memory for pci attributes\n"); |
797 | "attributes\n"); | ||
798 | goto err_pci; | 792 | goto err_pci; |
799 | } | 793 | } |
800 | 794 | ||
@@ -826,15 +820,13 @@ struct vme_dma_attr *vme_dma_vme_attribute(unsigned long long address, | |||
826 | attributes = kmalloc( | 820 | attributes = kmalloc( |
827 | sizeof(struct vme_dma_attr), GFP_KERNEL); | 821 | sizeof(struct vme_dma_attr), GFP_KERNEL); |
828 | if (attributes == NULL) { | 822 | if (attributes == NULL) { |
829 | printk(KERN_ERR "Unable to allocate memory for attributes " | 823 | printk(KERN_ERR "Unable to allocate memory for attributes structure\n"); |
830 | "structure\n"); | ||
831 | goto err_attr; | 824 | goto err_attr; |
832 | } | 825 | } |
833 | 826 | ||
834 | vme_attr = kmalloc(sizeof(struct vme_dma_vme), GFP_KERNEL); | 827 | vme_attr = kmalloc(sizeof(struct vme_dma_vme), GFP_KERNEL); |
835 | if (vme_attr == NULL) { | 828 | if (vme_attr == NULL) { |
836 | printk(KERN_ERR "Unable to allocate memory for vme " | 829 | printk(KERN_ERR "Unable to allocate memory for vme attributes\n"); |
837 | "attributes\n"); | ||
838 | goto err_vme; | 830 | goto err_vme; |
839 | } | 831 | } |
840 | 832 | ||
@@ -982,8 +974,8 @@ void vme_irq_handler(struct vme_bridge *bridge, int level, int statid) | |||
982 | if (call != NULL) | 974 | if (call != NULL) |
983 | call(level, statid, priv_data); | 975 | call(level, statid, priv_data); |
984 | else | 976 | else |
985 | printk(KERN_WARNING "Spurilous VME interrupt, level:%x, " | 977 | printk(KERN_WARNING "Spurilous VME interrupt, level:%x, vector:%x\n", |
986 | "vector:%x\n", level, statid); | 978 | level, statid); |
987 | } | 979 | } |
988 | EXPORT_SYMBOL(vme_irq_handler); | 980 | EXPORT_SYMBOL(vme_irq_handler); |
989 | 981 | ||
@@ -1112,8 +1104,7 @@ struct vme_resource *vme_lm_request(struct vme_dev *vdev) | |||
1112 | struct vme_lm_resource, list); | 1104 | struct vme_lm_resource, list); |
1113 | 1105 | ||
1114 | if (lm == NULL) { | 1106 | if (lm == NULL) { |
1115 | printk(KERN_ERR "Registered NULL Location Monitor " | 1107 | printk(KERN_ERR "Registered NULL Location Monitor resource\n"); |
1116 | "resource\n"); | ||
1117 | continue; | 1108 | continue; |
1118 | } | 1109 | } |
1119 | 1110 | ||