diff options
author | Ed Cashin <ecashin@coraid.com> | 2012-12-17 19:03:39 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-17 20:15:24 -0500 |
commit | a04b41cd2c3ea39115a2d4f264773a5956a3318d (patch) | |
tree | f92e74151cfd816644cfd8f5be5606d572123816 /drivers/block/aoe | |
parent | d437962504462f31515344d58cdcaf0b73b389b5 (diff) |
aoe: whitespace cleanup
Signed-off-by: Ed Cashin <ecashin@coraid.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/block/aoe')
-rw-r--r-- | drivers/block/aoe/aoe.h | 2 | ||||
-rw-r--r-- | drivers/block/aoe/aoechr.c | 2 | ||||
-rw-r--r-- | drivers/block/aoe/aoecmd.c | 6 | ||||
-rw-r--r-- | drivers/block/aoe/aoemain.c | 2 | ||||
-rw-r--r-- | drivers/block/aoe/aoenet.c | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/drivers/block/aoe/aoe.h b/drivers/block/aoe/aoe.h index 52f75c097242..8e8da1cd204d 100644 --- a/drivers/block/aoe/aoe.h +++ b/drivers/block/aoe/aoe.h | |||
@@ -151,7 +151,7 @@ struct aoedev { | |||
151 | struct work_struct work;/* disk create work struct */ | 151 | struct work_struct work;/* disk create work struct */ |
152 | struct gendisk *gd; | 152 | struct gendisk *gd; |
153 | struct request_queue *blkq; | 153 | struct request_queue *blkq; |
154 | struct hd_geometry geo; | 154 | struct hd_geometry geo; |
155 | sector_t ssize; | 155 | sector_t ssize; |
156 | struct timer_list timer; | 156 | struct timer_list timer; |
157 | spinlock_t lock; | 157 | spinlock_t lock; |
diff --git a/drivers/block/aoe/aoechr.c b/drivers/block/aoe/aoechr.c index 2bf6273e6779..42e67ad6bd20 100644 --- a/drivers/block/aoe/aoechr.c +++ b/drivers/block/aoe/aoechr.c | |||
@@ -287,7 +287,7 @@ aoechr_init(void) | |||
287 | int n, i; | 287 | int n, i; |
288 | 288 | ||
289 | n = register_chrdev(AOE_MAJOR, "aoechr", &aoe_fops); | 289 | n = register_chrdev(AOE_MAJOR, "aoechr", &aoe_fops); |
290 | if (n < 0) { | 290 | if (n < 0) { |
291 | printk(KERN_ERR "aoe: can't register char device\n"); | 291 | printk(KERN_ERR "aoe: can't register char device\n"); |
292 | return n; | 292 | return n; |
293 | } | 293 | } |
diff --git a/drivers/block/aoe/aoecmd.c b/drivers/block/aoe/aoecmd.c index df86a05067e8..3ce01f6b3a5d 100644 --- a/drivers/block/aoe/aoecmd.c +++ b/drivers/block/aoe/aoecmd.c | |||
@@ -978,7 +978,7 @@ ktiocomplete(struct frame *f) | |||
978 | pr_err("aoe: ata error cmd=%2.2Xh stat=%2.2Xh from e%ld.%d\n", | 978 | pr_err("aoe: ata error cmd=%2.2Xh stat=%2.2Xh from e%ld.%d\n", |
979 | ahout->cmdstat, ahin->cmdstat, | 979 | ahout->cmdstat, ahin->cmdstat, |
980 | d->aoemajor, d->aoeminor); | 980 | d->aoemajor, d->aoeminor); |
981 | noskb: if (buf) | 981 | noskb: if (buf) |
982 | clear_bit(BIO_UPTODATE, &buf->bio->bi_flags); | 982 | clear_bit(BIO_UPTODATE, &buf->bio->bi_flags); |
983 | goto badrsp; | 983 | goto badrsp; |
984 | } | 984 | } |
@@ -1191,7 +1191,7 @@ aoecmd_cfg(ushort aoemajor, unsigned char aoeminor) | |||
1191 | aoecmd_cfg_pkts(aoemajor, aoeminor, &queue); | 1191 | aoecmd_cfg_pkts(aoemajor, aoeminor, &queue); |
1192 | aoenet_xmit(&queue); | 1192 | aoenet_xmit(&queue); |
1193 | } | 1193 | } |
1194 | 1194 | ||
1195 | struct sk_buff * | 1195 | struct sk_buff * |
1196 | aoecmd_ata_id(struct aoedev *d) | 1196 | aoecmd_ata_id(struct aoedev *d) |
1197 | { | 1197 | { |
@@ -1230,7 +1230,7 @@ aoecmd_ata_id(struct aoedev *d) | |||
1230 | 1230 | ||
1231 | return skb_clone(skb, GFP_ATOMIC); | 1231 | return skb_clone(skb, GFP_ATOMIC); |
1232 | } | 1232 | } |
1233 | 1233 | ||
1234 | static struct aoetgt * | 1234 | static struct aoetgt * |
1235 | addtgt(struct aoedev *d, char *addr, ulong nframes) | 1235 | addtgt(struct aoedev *d, char *addr, ulong nframes) |
1236 | { | 1236 | { |
diff --git a/drivers/block/aoe/aoemain.c b/drivers/block/aoe/aoemain.c index 04793c2c701b..4b987c2fefbe 100644 --- a/drivers/block/aoe/aoemain.c +++ b/drivers/block/aoe/aoemain.c | |||
@@ -105,7 +105,7 @@ aoe_init(void) | |||
105 | aoechr_exit(); | 105 | aoechr_exit(); |
106 | chr_fail: | 106 | chr_fail: |
107 | aoedev_exit(); | 107 | aoedev_exit(); |
108 | 108 | ||
109 | printk(KERN_INFO "aoe: initialisation failure.\n"); | 109 | printk(KERN_INFO "aoe: initialisation failure.\n"); |
110 | return ret; | 110 | return ret; |
111 | } | 111 | } |
diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c index 24eca2bf9416..2e47404ff008 100644 --- a/drivers/block/aoe/aoenet.c +++ b/drivers/block/aoe/aoenet.c | |||
@@ -124,8 +124,8 @@ aoenet_xmit(struct sk_buff_head *queue) | |||
124 | } | 124 | } |
125 | } | 125 | } |
126 | 126 | ||
127 | /* | 127 | /* |
128 | * (1) len doesn't include the header by default. I want this. | 128 | * (1) len doesn't include the header by default. I want this. |
129 | */ | 129 | */ |
130 | static int | 130 | static int |
131 | aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt, struct net_device *orig_dev) | 131 | aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt, struct net_device *orig_dev) |