From patchwork Sat Jun 28 18:33:45 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Aring X-Patchwork-Id: 365305 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 6108B1400B5 for ; Sun, 29 Jun 2014 04:35:28 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932476AbaF1SfV (ORCPT ); Sat, 28 Jun 2014 14:35:21 -0400 Received: from mail-wg0-f45.google.com ([74.125.82.45]:58462 "EHLO mail-wg0-f45.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757050AbaF1Sen (ORCPT ); Sat, 28 Jun 2014 14:34:43 -0400 Received: by mail-wg0-f45.google.com with SMTP id l18so6346297wgh.28 for ; Sat, 28 Jun 2014 11:34:42 -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=X9dy7c7HcSVgUwk/8EzU94ei1ObtlctY9twzAVTVUYg=; b=AUlbOC8eSe5tZ/TS8odOK/cBZpwmSLRiwdR/Vqm+Cn7BhHy07lnzz0xTyTaIL/4LLd wjYH9lDjjTK/sl8DuwqhdNHTqdrC+HoGKFYBK89wshsmqQnwJ0x1t2D77kUyMmtgh4xv Ae7INi0liA43HyQ0bCIl+kSdG/9Xl4tvOM2JVK1xdEAiFh6OgYhfvVkavZcwl0UvDHTs cuv1hGlj+5695Sls9QgVOEGwvwWK3bZswyNGz2uILlzxBQVQpoLOXBh+edFnGdjs6bRt WrRTGvG4TcjFoODkzhe+bq8j9/8nMfLjY8duKUt+6VAV+7jgDqfHFfUy4k9ebe2g0u/7 044A== X-Received: by 10.180.188.103 with SMTP id fz7mr19395405wic.73.1403980482621; Sat, 28 Jun 2014 11:34:42 -0700 (PDT) Received: from omega.localdomain (p4FD3BDAF.dip0.t-ipconnect.de. [79.211.189.175]) by mx.google.com with ESMTPSA id m3sm29433289wjr.49.2014.06.28.11.34.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 28 Jun 2014 11:34:42 -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, werner@almesberger.net, Alexander Aring Subject: [PATCH net-next 07/13] at86rf230: move RX_SAFE_MODE setting to hw_init Date: Sat, 28 Jun 2014 20:33:45 +0200 Message-Id: <1403980431-6201-8-git-send-email-alex.aring@gmail.com> X-Mailer: git-send-email 2.0.1 In-Reply-To: <1403980431-6201-1-git-send-email-alex.aring@gmail.com> References: <1403980431-6201-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 c0ea7b1..35088a8 100644 --- a/drivers/net/ieee802154/at86rf230.c +++ b/drivers/net/ieee802154/at86rf230.c @@ -1012,13 +1012,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; @@ -1302,6 +1297,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;