diff options
| author | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-04-14 23:27:29 +0200 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2011-04-15 00:26:32 +0200 |
| commit | e5f4b3c498623fc3d83f6d92e00a2b2dbf500cd0 (patch) | |
| tree | 0a503d6fd6e625bf61f697367124cc5b6f03cfbc /drivers/xen/blkback/interface.c | |
| parent | xen/blkback: Fix checkpatch warnings in vbd.c (diff) | |
| download | linux-e5f4b3c498623fc3d83f6d92e00a2b2dbf500cd0.tar.xz linux-e5f4b3c498623fc3d83f6d92e00a2b2dbf500cd0.zip | |
xen/blkback: Fix interface.c checkpatch warnings .. except
+ sring_x86_64 = (struct blkif_x86_64_sring *)blkif->blk_ring_area->addr;
WARNING: line over 80 characters
+ BACK_RING_INIT(&blkif->blk_rings.x86_64, sring_x86_64, PAGE_SIZE);
as breaking them up really does not help that much.
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to '')
| -rw-r--r-- | drivers/xen/blkback/interface.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/xen/blkback/interface.c b/drivers/xen/blkback/interface.c index 7d59f13115cf..163aed41e825 100644 --- a/drivers/xen/blkback/interface.c +++ b/drivers/xen/blkback/interface.c @@ -86,7 +86,8 @@ static void unmap_frontend_page(struct blkif_st *blkif) BUG(); } -int blkif_map(struct blkif_st *blkif, unsigned long shared_page, unsigned int evtchn) +int blkif_map(struct blkif_st *blkif, unsigned long shared_page, + unsigned int evtchn) { int err; @@ -94,7 +95,8 @@ int blkif_map(struct blkif_st *blkif, unsigned long shared_page, unsigned int ev if (blkif->irq) return 0; - if ( (blkif->blk_ring_area = alloc_vm_area(PAGE_SIZE)) == NULL ) + blkif->blk_ring_area = alloc_vm_area(PAGE_SIZE); + if (!blkif->blk_ring_area) return -ENOMEM; err = map_frontend_page(blkif, shared_page); @@ -131,8 +133,7 @@ int blkif_map(struct blkif_st *blkif, unsigned long shared_page, unsigned int ev err = bind_interdomain_evtchn_to_irqhandler( blkif->domid, evtchn, blkif_be_int, 0, "blkif-backend", blkif); - if (err < 0) - { + if (err < 0) { unmap_frontend_page(blkif); free_vm_area(blkif->blk_ring_area); blkif->blk_rings.common.sring = NULL; |