From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wg0-f42.google.com ([74.125.82.42]:35782 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752318AbbEFLlN (ORCPT ); Wed, 6 May 2015 07:41:13 -0400 Received: by wgyo15 with SMTP id o15so8388552wgy.2 for ; Wed, 06 May 2015 04:41:12 -0700 (PDT) From: Alexander Aring Subject: [PATCHv2 wpan-next 07/16] mac802154: remove check if operation is supported Date: Wed, 6 May 2015 13:40:19 +0200 Message-Id: <1430912428-17284-8-git-send-email-alex.aring@gmail.com> In-Reply-To: <1430912428-17284-1-git-send-email-alex.aring@gmail.com> References: <1430912428-17284-1-git-send-email-alex.aring@gmail.com> Sender: linux-wpan-owner@vger.kernel.org List-ID: To: linux-wpan@vger.kernel.org Cc: kernel@pengutronix.de, Alexander Aring This patch removes the check if operation is supported by driver layer. This is done now by capabilities flags, if these are valid then the driver should support the operation, otherwise a WARN_ON occurs. Signed-off-by: Alexander Aring --- net/mac802154/cfg.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/net/mac802154/cfg.c b/net/mac802154/cfg.c index 45c4dc3..d5290ea 100644 --- a/net/mac802154/cfg.c +++ b/net/mac802154/cfg.c @@ -98,10 +98,6 @@ ieee802154_set_cca_mode(struct wpan_phy *wpan_phy, if (wpan_phy_cca_cmp(&wpan_phy->cca, cca)) return 0; - /* check if phy support this setting */ - if (!(local->hw.flags & IEEE802154_HW_CCA_MODE)) - return -EOPNOTSUPP; - ret = drv_set_cca_mode(local, cca); if (!ret) wpan_phy->cca = *cca; @@ -127,17 +123,12 @@ ieee802154_set_backoff_exponent(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev, u8 min_be, u8 max_be) { - struct ieee802154_local *local = wpan_phy_priv(wpan_phy); - ASSERT_RTNL(); if (wpan_dev->min_be == min_be && wpan_dev->max_be == max_be) return 0; - if (!(local->hw.flags & IEEE802154_HW_CSMA_PARAMS)) - return -EOPNOTSUPP; - wpan_dev->min_be = min_be; wpan_dev->max_be = max_be; return 0; @@ -161,16 +152,11 @@ ieee802154_set_max_csma_backoffs(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev, u8 max_csma_backoffs) { - struct ieee802154_local *local = wpan_phy_priv(wpan_phy); - ASSERT_RTNL(); if (wpan_dev->csma_retries == max_csma_backoffs) return 0; - if (!(local->hw.flags & IEEE802154_HW_CSMA_PARAMS)) - return -EOPNOTSUPP; - wpan_dev->csma_retries = max_csma_backoffs; return 0; } @@ -180,16 +166,11 @@ ieee802154_set_max_frame_retries(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev, s8 max_frame_retries) { - struct ieee802154_local *local = wpan_phy_priv(wpan_phy); - ASSERT_RTNL(); if (wpan_dev->frame_retries == max_frame_retries) return 0; - if (!(local->hw.flags & IEEE802154_HW_FRAME_RETRIES)) - return -EOPNOTSUPP; - wpan_dev->frame_retries = max_frame_retries; return 0; } @@ -198,16 +179,11 @@ static int ieee802154_set_lbt_mode(struct wpan_phy *wpan_phy, struct wpan_dev *wpan_dev, bool mode) { - struct ieee802154_local *local = wpan_phy_priv(wpan_phy); - ASSERT_RTNL(); if (wpan_dev->lbt == mode) return 0; - if (!(local->hw.flags & IEEE802154_HW_LBT)) - return -EOPNOTSUPP; - wpan_dev->lbt = mode; return 0; } -- 2.3.7