From 23e0affdd293d0f6625a097911800b48b5428727 Mon Sep 17 00:00:00 2001 From: Isaku Yamahata Date: Thu, 2 Jul 2009 19:32:08 +0900 Subject: ioport: consolidate duplicated logic in register_ioport_{read, write}(). Signed-off-by: Isaku Yamahata Signed-off-by: Anthony Liguori --- ioport.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) (limited to 'ioport.c') diff --git a/ioport.c b/ioport.c index 04bffc4cbc..01cfaf7061 100644 --- a/ioport.c +++ b/ioport.c @@ -121,19 +121,27 @@ static void default_ioport_writel(void *opaque, uint32_t address, uint32_t data) #endif } +static int ioport_bsize(int size, int *bsize) +{ + if (size == 1) { + *bsize = 0; + } else if (size == 2) { + *bsize = 1; + } else if (size == 4) { + *bsize = 2; + } else { + return -1; + } + return 0; +} + /* size is the word size in byte */ int register_ioport_read(int start, int length, int size, IOPortReadFunc *func, void *opaque) { int i, bsize; - if (size == 1) { - bsize = 0; - } else if (size == 2) { - bsize = 1; - } else if (size == 4) { - bsize = 2; - } else { + if (ioport_bsize(size, &bsize)) { hw_error("register_ioport_read: invalid size"); return -1; } @@ -152,13 +160,7 @@ int register_ioport_write(int start, int length, int size, { int i, bsize; - if (size == 1) { - bsize = 0; - } else if (size == 2) { - bsize = 1; - } else if (size == 4) { - bsize = 2; - } else { + if (ioport_bsize(size, &bsize)) { hw_error("register_ioport_write: invalid size"); return -1; } -- cgit v1.2.1