| Message ID | 1404313810-30232-9-git-send-email-alex.aring@gmail.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
Hi, On Wed, Jul 02, 2014 at 05:10:05PM +0200, Alexander Aring wrote: > This patch rework the irq_pol register setting for rising and falling > interrupt settings only. The default behaviour should be rising flag. > > Also use IRQ_TYPE_* defines instead of IRQF_* defines. There is no > functionality change but irq_get_trigger_type returns IRQ_TYPE_* defines. > > Signed-off-by: Alexander Aring <alex.aring@gmail.com> > --- > drivers/net/ieee802154/at86rf230.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c > index 492fb7e..2340750 100644 > --- a/drivers/net/ieee802154/at86rf230.c > +++ b/drivers/net/ieee802154/at86rf230.c > @@ -1276,7 +1276,7 @@ static struct at86rf2xx_chip_data at86rf212_data = { > > static int at86rf230_hw_init(struct at86rf230_local *lp) > { > - int rc, irq_pol, irq_type; > + int rc, irq_pol, irq_type = IRQ_ACTIVE_HIGH; this should be: int rc, irq_type, irq_pol = IRQ_ACTIVE_HIGH; > unsigned int dvdd; > u8 csma_seed[2]; > > @@ -1285,11 +1285,8 @@ static int at86rf230_hw_init(struct at86rf230_local *lp) > return rc; > > irq_type = irq_get_trigger_type(lp->spi->irq); > - /* configure irq polarity, defaults to high active */ > - if (irq_type & (IRQF_TRIGGER_FALLING | IRQF_TRIGGER_LOW)) > - irq_pol = IRQ_ACTIVE_LOW; > - else > - irq_pol = IRQ_ACTIVE_HIGH; > + if (irq_type == IRQ_TYPE_EDGE_FALLING) > + irq_type = IRQ_ACTIVE_LOW; and this: if (irq_type == IRQ_TYPE_EDGE_FALLING) irq_pol = IRQ_ACTIVE_LOW; Sorry, I will send a v3. - Alex -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c index 492fb7e..2340750 100644 --- a/drivers/net/ieee802154/at86rf230.c +++ b/drivers/net/ieee802154/at86rf230.c @@ -1276,7 +1276,7 @@ static struct at86rf2xx_chip_data at86rf212_data = { static int at86rf230_hw_init(struct at86rf230_local *lp) { - int rc, irq_pol, irq_type; + int rc, irq_pol, irq_type = IRQ_ACTIVE_HIGH; unsigned int dvdd; u8 csma_seed[2]; @@ -1285,11 +1285,8 @@ static int at86rf230_hw_init(struct at86rf230_local *lp) return rc; irq_type = irq_get_trigger_type(lp->spi->irq); - /* configure irq polarity, defaults to high active */ - if (irq_type & (IRQF_TRIGGER_FALLING | IRQF_TRIGGER_LOW)) - irq_pol = IRQ_ACTIVE_LOW; - else - irq_pol = IRQ_ACTIVE_HIGH; + if (irq_type == IRQ_TYPE_EDGE_FALLING) + irq_type = IRQ_ACTIVE_LOW; rc = at86rf230_write_subreg(lp, SR_IRQ_POLARITY, irq_pol); if (rc)
This patch rework the irq_pol register setting for rising and falling interrupt settings only. The default behaviour should be rising flag. Also use IRQ_TYPE_* defines instead of IRQF_* defines. There is no functionality change but irq_get_trigger_type returns IRQ_TYPE_* defines. Signed-off-by: Alexander Aring <alex.aring@gmail.com> --- drivers/net/ieee802154/at86rf230.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)