Add helper macro IS_ISA_BOARD(board) to check if the driver supports ISA
boards and this is an ISA board, and IS_PCI_BOARD(board) to check if the
driver supports PCI boards and this is a PCI board.
Signed-off-by: Ian Abbott <abbotti@xxxxxxxxx>
---
drivers/staging/comedi/drivers/amplc_pc236.c | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/drivers/staging/comedi/drivers/amplc_pc236.c b/drivers/staging/comedi/drivers/amplc_pc236.c
index 6b056bd..3d7b001 100644
--- a/drivers/staging/comedi/drivers/amplc_pc236.c
+++ b/drivers/staging/comedi/drivers/amplc_pc236.c
@@ -105,6 +105,10 @@ struct pc236_board {
enum pc236_bustype bustype;
enum pc236_model model;
};
+
+#define IS_ISA_BOARD(board) (DO_ISA && (board)->bustype == isa_bustype)
+#define IS_PCI_BOARD(board) (DO_PCI && (board)->bustype == pci_bustype)
+
static const struct pc236_board pc236_boards[] = {
#if DO_ISA
{
@@ -416,10 +420,10 @@ static void pc236_report_attach(struct comedi_device *dev, unsigned int irq)
char tmpbuf[60];
int tmplen;
- if (DO_ISA && thisboard->bustype == isa_bustype)
+ if (IS_ISA_BOARD(thisboard))
tmplen = scnprintf(tmpbuf, sizeof(tmpbuf),
"(base %#lx) ", dev->iobase);
- else if (DO_PCI && thisboard->bustype == pci_bustype) {
+ else if (IS_PCI_BOARD(thisboard)) {
tmplen = scnprintf(tmpbuf, sizeof(tmpbuf),
"(pci %s) ", pci_name(pcidev));
} else
@@ -517,14 +521,14 @@ static int pc236_attach(struct comedi_device *dev, struct comedi_devconfig *it)
return ret;
}
/* Process options according to bus type. */
- if (DO_ISA && thisboard->bustype == isa_bustype) {
+ if (IS_ISA_BOARD(thisboard)) {
unsigned long iobase = it->options[0];
unsigned int irq = it->options[1];
ret = pc236_request_region(dev, iobase, PC236_IO_SIZE);
if (ret < 0)
return ret;
return pc236_common_attach(dev, iobase, irq, 0);
- } else if (DO_PCI && thisboard->bustype == pci_bustype) {
+ } else if (IS_PCI_BOARD(thisboard)) {
struct pci_dev *pci_dev;
pci_dev = pc236_find_pci_dev(dev, it);
--
1.7.8.6
_______________________________________________
devel mailing list
devel@xxxxxxxxxxxxxxxxxxxxxx
http://driverdev.linuxdriverproject.org/mailman/listinfo/devel
