Messages in this thread Patch in this message | | | Date | Wed, 28 Sep 2005 10:37:37 +0200 | From | Borislav Petkov <> | Subject | [PATCH] remove check_region in drivers-char-specialix.c |
| |
Hi Andrew,
This is also a pretty simple case. We remove the wrapper and make sx__request_io_range return struct resource *. We check its value accordingly in the probing routine. It compiles cleanly here.
Signed-off-by: Borislav Petkov <petkov@uni-muenster.de>
--- 2.6.14-rc2/drivers/char/specialix.c.orig 2005-09-28 10:02:31.000000000 +0200 +++ 2.6.14-rc2/drivers/char/specialix.c 2005-09-28 10:30:24.000000000 +0200 @@ -338,15 +338,9 @@ static inline void sx_wait_CCR_off(struc * specialix IO8+ IO range functions. */ -static inline int sx_check_io_range(struct specialix_board * bp) +static inline struct resource * sx_request_io_range(struct specialix_board * bp) { - return check_region (bp->base, SX_IO_SPACE); -} - - -static inline void sx_request_io_range(struct specialix_board * bp) -{ - request_region(bp->base, + return request_region(bp->base, bp->flags&SX_BOARD_IS_PCI?SX_PCI_IO_SPACE:SX_IO_SPACE, "specialix IO8+" ); } @@ -495,7 +489,7 @@ static int sx_probe(struct specialix_boa func_enter(); - if (sx_check_io_range(bp)) { + if (!sx_request_io_range(bp)) { func_exit(); return 1; } @@ -583,7 +577,6 @@ static int sx_probe(struct specialix_boa return -EIO; } - sx_request_io_range(bp); bp->flags |= SX_BOARD_PRESENT; /* Chip revcode pkgtype
___________________________________________________________ Gesendet von Yahoo! Mail - Jetzt mit 1GB Speicher kostenlos - Hier anmelden: http://mail.yahoo.de - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |