aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/zorro/zorro.c
diff options
context:
space:
mode:
authorJacob <jacobenders1@gmail.com>2018-05-12 23:11:40 -0400
committerGeert Uytterhoeven <geert@linux-m68k.org>2018-05-22 04:31:51 -0400
commitd49cbe73beb7ff51cb09aeb8b1b1347d2e08438a (patch)
tree86cc0cbca689f6c7a7cf43a394c9b40a78b8cb29 /drivers/zorro/zorro.c
parent065f109f2506d6b178555e3b2f0c91510211ee12 (diff)
zorro: Add a blank line after declarations
Fixes a coding style issue. Signed-off-by: Jacob Enders <jacobenders1@gmail.com> Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Diffstat (limited to 'drivers/zorro/zorro.c')
-rw-r--r--drivers/zorro/zorro.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c
index 47728477297e..67fa900572a9 100644
--- a/drivers/zorro/zorro.c
+++ b/drivers/zorro/zorro.c
@@ -101,6 +101,7 @@ static void __init mark_region(unsigned long start, unsigned long end,
101 end = end > Z2RAM_END ? Z2RAM_SIZE : end-Z2RAM_START; 101 end = end > Z2RAM_END ? Z2RAM_SIZE : end-Z2RAM_START;
102 while (start < end) { 102 while (start < end) {
103 u32 chunk = start>>Z2RAM_CHUNKSHIFT; 103 u32 chunk = start>>Z2RAM_CHUNKSHIFT;
104
104 if (flag) 105 if (flag)
105 set_bit(chunk, zorro_unused_z2ram); 106 set_bit(chunk, zorro_unused_z2ram);
106 else 107 else
@@ -117,6 +118,7 @@ static struct resource __init *zorro_find_parent_resource(
117 118
118 for (i = 0; i < bridge->num_resources; i++) { 119 for (i = 0; i < bridge->num_resources; i++) {
119 struct resource *r = &bridge->resource[i]; 120 struct resource *r = &bridge->resource[i];
121
120 if (zorro_resource_start(z) >= r->start && 122 if (zorro_resource_start(z) >= r->start &&
121 zorro_resource_end(z) <= r->end) 123 zorro_resource_end(z) <= r->end)
122 return r; 124 return r;
@@ -168,6 +170,7 @@ static int __init amiga_zorro_probe(struct platform_device *pdev)
168 if (z->id == ZORRO_PROD_GVP_EPC_BASE) { 170 if (z->id == ZORRO_PROD_GVP_EPC_BASE) {
169 /* GVP quirk */ 171 /* GVP quirk */
170 unsigned long magic = zi->boardaddr + 0x8000; 172 unsigned long magic = zi->boardaddr + 0x8000;
173
171 z->id |= *(u16 *)ZTWO_VADDR(magic) & GVP_PRODMASK; 174 z->id |= *(u16 *)ZTWO_VADDR(magic) & GVP_PRODMASK;
172 } 175 }
173 z->slotaddr = zi->slotaddr; 176 z->slotaddr = zi->slotaddr;