From patchwork Wed Jul 2 15:10:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 366395 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 31E321400E8 for ; Thu, 3 Jul 2014 01:10:53 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754790AbaGBPKt (ORCPT ); Wed, 2 Jul 2014 11:10:49 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:57990 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754587AbaGBPK1 (ORCPT ); Wed, 2 Jul 2014 11:10:27 -0400 Received: by mail-wi0-f172.google.com with SMTP id hi2so9789684wib.5 for ; Wed, 02 Jul 2014 08:10:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=w4C4P4Bh276UsKDhCS2Fw1kswICGZwGjPc2WaVJg1aA=; b=bZfzkbMDTV0kAxJeWpnzpeBgzZBA8yCDbej8Zdi2hEjmRJfX3GdJiSEor5rbiNUS2L V9jpTzXwQP85lAMac2XDw9BfqNZGljSNlQm5b/i7ArfwVAhkjWCBjH1nlz8taugVOeBe IZUFs25QTHOh5nQqe8tMY9tKMsBd82bmQhlYYS0JhiKL3w2Xxp5Ljz+Xx2+ZD13lcPQG brTFKzyvtFcEcNuOGHrxJQ+kI/khIvu3UHK0GzIBNXEgd/PLSfOzp8OLfpbl3e9BHN4P sjzkoDK+qnXRolM9mkOqtQ3BI92rsgrBIPIRFpvXcCBfmOIJ3fEKeiIQrqi2DDEKhjdD FxRQ== X-Received: by 10.180.189.234 with SMTP id gl10mr5006562wic.56.1404313825637; Wed, 02 Jul 2014 08:10:25 -0700 (PDT) Received: from omega.localdomain (p4FD3BDAF.dip0.t-ipconnect.de. [79.211.189.175]) by mx.google.com with ESMTPSA id cj8sm55656607wjb.5.2014.07.02.08.10.24 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Jul 2014 08:10:25 -0700 (PDT) From: Alexander Aring To: alex.bluesman.smirnov@gmail.com Cc: dbaryshkov@gmail.com, linux-zigbee-devel@lists.sourceforge.net, netdev@vger.kernel.org, stilwellt@openlabs.co, Alexander Aring Subject: [PATCH v2 net-next 08/13] at86rf230: rework irq_pol setting Date: Wed, 2 Jul 2014 17:10:05 +0200 Message-Id: <1404313810-30232-9-git-send-email-alex.aring@gmail.com> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1404313810-30232-1-git-send-email-alex.aring@gmail.com> References: <1404313810-30232-1-git-send-email-alex.aring@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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; 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)