Commit 916f11c7 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Linus Torvalds

smsc-ircc2: tidy up module parameter checking

To determine whether the user specified a module parameter, use some #defines
instead of checking for bare magic numbers.
Signed-off-by: default avatarBjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Keith Owens <kaos@ocs.com.au>
Cc: Len Brown <lenb@kernel.org>
Cc: Adam Belay <ambx1@neo.rr.com>
Cc: Matthieu CASTET <castet.matthieu@free.fr>
Cc: Jean Tourrilhes <jt@hpl.hp.com>
Cc: Matthew Garrett <mjg59@srcf.ucam.org>
Cc: Ville Syrjala <syrjala@sci.fi>
Cc: Russell King <rmk+serial@arm.linux.org.uk>
Cc: Samuel Ortiz <samuel@sortiz.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a1e7e636
...@@ -79,11 +79,13 @@ MODULE_AUTHOR("Daniele Peri <peri@csai.unipa.it>"); ...@@ -79,11 +79,13 @@ MODULE_AUTHOR("Daniele Peri <peri@csai.unipa.it>");
MODULE_DESCRIPTION("SMC IrCC SIR/FIR controller driver"); MODULE_DESCRIPTION("SMC IrCC SIR/FIR controller driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
static int ircc_dma = 255; #define DMA_INVAL 255
static int ircc_dma = DMA_INVAL;
module_param(ircc_dma, int, 0); module_param(ircc_dma, int, 0);
MODULE_PARM_DESC(ircc_dma, "DMA channel"); MODULE_PARM_DESC(ircc_dma, "DMA channel");
static int ircc_irq = 255; #define IRQ_INVAL 255
static int ircc_irq = IRQ_INVAL;
module_param(ircc_irq, int, 0); module_param(ircc_irq, int, 0);
MODULE_PARM_DESC(ircc_irq, "IRQ line"); MODULE_PARM_DESC(ircc_irq, "IRQ line");
...@@ -646,7 +648,7 @@ static void smsc_ircc_setup_io(struct smsc_ircc_cb *self, ...@@ -646,7 +648,7 @@ static void smsc_ircc_setup_io(struct smsc_ircc_cb *self,
self->io.fifo_size = SMSC_IRCC2_FIFO_SIZE; self->io.fifo_size = SMSC_IRCC2_FIFO_SIZE;
self->io.speed = SMSC_IRCC2_C_IRDA_FALLBACK_SPEED; self->io.speed = SMSC_IRCC2_C_IRDA_FALLBACK_SPEED;
if (irq < 255) { if (irq != IRQ_INVAL) {
if (irq != chip_irq) if (irq != chip_irq)
IRDA_MESSAGE("%s, Overriding IRQ - chip says %d, using %d\n", IRDA_MESSAGE("%s, Overriding IRQ - chip says %d, using %d\n",
driver_name, chip_irq, irq); driver_name, chip_irq, irq);
...@@ -654,7 +656,7 @@ static void smsc_ircc_setup_io(struct smsc_ircc_cb *self, ...@@ -654,7 +656,7 @@ static void smsc_ircc_setup_io(struct smsc_ircc_cb *self,
} else } else
self->io.irq = chip_irq; self->io.irq = chip_irq;
if (dma < 255) { if (dma != DMA_INVAL) {
if (dma != chip_dma) if (dma != chip_dma)
IRDA_MESSAGE("%s, Overriding DMA - chip says %d, using %d\n", IRDA_MESSAGE("%s, Overriding DMA - chip says %d, using %d\n",
driver_name, chip_dma, dma); driver_name, chip_dma, dma);
...@@ -2836,9 +2838,9 @@ static int __init smsc_ircc_preconfigure_subsystems(unsigned short ircc_cfg, ...@@ -2836,9 +2838,9 @@ static int __init smsc_ircc_preconfigure_subsystems(unsigned short ircc_cfg,
tmpconf.fir_io = ircc_fir; tmpconf.fir_io = ircc_fir;
if (ircc_sir != 0) if (ircc_sir != 0)
tmpconf.sir_io = ircc_sir; tmpconf.sir_io = ircc_sir;
if (ircc_dma != 0xff) if (ircc_dma != DMA_INVAL)
tmpconf.fir_dma = ircc_dma; tmpconf.fir_dma = ircc_dma;
if (ircc_irq != 0xff) if (ircc_irq != IRQ_INVAL)
tmpconf.fir_irq = ircc_irq; tmpconf.fir_irq = ircc_irq;
IRDA_MESSAGE("Detected unconfigured %s SMSC IrDA chip, pre-configuring device.\n", conf->name); IRDA_MESSAGE("Detected unconfigured %s SMSC IrDA chip, pre-configuring device.\n", conf->name);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment