From patchwork Wed Jul 2 15:10:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 366401 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 6EB2A1400B0 for ; Thu, 3 Jul 2014 01:18:12 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753718AbaGBPSH (ORCPT ); Wed, 2 Jul 2014 11:18:07 -0400 Received: from mail-wg0-f49.google.com ([74.125.82.49]:60003 "EHLO mail-wg0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752148AbaGBPSG (ORCPT ); Wed, 2 Jul 2014 11:18:06 -0400 Received: by mail-wg0-f49.google.com with SMTP id y10so11611156wgg.32 for ; Wed, 02 Jul 2014 08:18:03 -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=1g+a2pA2XmsLpLIeuoMs9qK7CsyZ6XqzmKT6oyQxwC0=; b=c/N+W4wzTmvqM48ClhTxKpb09UKQToSvcODKDHKDJk16omduxCEfEc3wf7v22K6R6K 6f34avZRanAZ0E/nbZGWC0OAp5YPm1VEj6R6C+YBr2uLIIRD6mXX9xdD5ldNT+AtgSka celVGQ46ksDJHmSdellz3SugTp81+UmyL3cBV02AvKFLGge3ogGOY1X/m27YDgghEr6Q YncpkqG7LgPWZUITRh36sStuA0O7Zq3nKpwcmIc9Whd3xhDYrDQwAefm27E06A/Xsow+ 1u7E0K08JcO9XHp7K4toBz54rX6ytXPVsGwgKbYqWHtIWJVgeI+8TVNzs01ir94K3b8d s7VQ== X-Received: by 10.180.12.137 with SMTP id y9mr4973516wib.46.1404313824811; Wed, 02 Jul 2014 08:10:24 -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.23 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 02 Jul 2014 08:10:24 -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 07/13] at86rf230: move RX_SAFE_MODE setting to hw_init Date: Wed, 2 Jul 2014 17:10:04 +0200 Message-Id: <1404313810-30232-8-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 There is no need to set this bit in start callback which could be called more than once. Signed-off-by: Alexander Aring --- drivers/net/ieee802154/at86rf230.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c index 39c3c11..492fb7e 100644 --- a/drivers/net/ieee802154/at86rf230.c +++ b/drivers/net/ieee802154/at86rf230.c @@ -1010,13 +1010,8 @@ err: static int at86rf230_start(struct ieee802154_dev *dev) { - struct at86rf230_local *lp = dev->priv; u8 rc; - rc = at86rf230_write_subreg(lp, SR_RX_SAFE_MODE, 1); - if (rc) - return rc; - rc = at86rf230_state(dev, STATE_TX_ON); if (rc) return rc; @@ -1300,6 +1295,10 @@ static int at86rf230_hw_init(struct at86rf230_local *lp) if (rc) return rc; + rc = at86rf230_write_subreg(lp, SR_RX_SAFE_MODE, 1); + if (rc) + return rc; + rc = at86rf230_write_subreg(lp, SR_IRQ_MASK, IRQ_TRX_END); if (rc) return rc;