mac802154: remove might_sleep from driver layer

This patch removes all might_sleep calls from driver layer. This
handling is already done by mac802154 layer.

Signed-off-by: Alexander Aring <alex.aring@gmail.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/drivers/net/ieee802154/at86rf230.c b/drivers/net/ieee802154/at86rf230.c
index 5068c1bd004669f83c97e702ef5fb3744970a48d..b83ad0b386885a609819408e427704ba35aa6a55 100644 (file)
--- a/drivers/net/ieee802154/at86rf230.c
+++ b/drivers/net/ieee802154/at86rf230.c
@@ -993,7 +993,6 @@ at86rf230_xmit(struct ieee802154_hw *hw, struct sk_buff *skb)
 static int
 at86rf230_ed(struct ieee802154_hw *hw, u8 *level)
 {
-       might_sleep();
        BUG_ON(!level);
        *level = 0xbe;
        return 0;
@@ -1048,8 +1047,6 @@ at86rf230_channel(struct ieee802154_hw *hw, u8 page, u8 channel)
        struct at86rf230_local *lp = hw->priv;
        int rc;
 
-       might_sleep();
-
        if (page < 0 || page > 31 ||
            !(lp->hw->phy->channels_supported[page] & BIT(channel))) {
                WARN_ON(1);

diff --git a/drivers/net/ieee802154/cc2520.c b/drivers/net/ieee802154/cc2520.c
index 78ea2cadeb78308e02da74f0b9769488791a3462..c56d10c7ccfa5e9ad516cc5578f6093dc129136c 100644 (file)
--- a/drivers/net/ieee802154/cc2520.c
+++ b/drivers/net/ieee802154/cc2520.c
@@ -574,7 +574,6 @@ cc2520_set_channel(struct ieee802154_hw *hw, u8 page, u8 channel)
        struct cc2520_private *priv = hw->priv;
        int ret;
 
-       might_sleep();
        dev_dbg(&priv->spi->dev, "trying to set channel\n");
 
        BUG_ON(page != 0);

diff --git a/drivers/net/ieee802154/fakelb.c b/drivers/net/ieee802154/fakelb.c
index 4092e704c4aab4a105bb5e38d56cad2f7f91ffa7..6e62286cef7849c4523e1334015729ca7f8fa39a 100644 (file)
--- a/drivers/net/ieee802154/fakelb.c
+++ b/drivers/net/ieee802154/fakelb.c
@@ -47,7 +47,6 @@ struct fakelb_priv {
 static int
 fakelb_hw_ed(struct ieee802154_hw *hw, u8 *level)
 {
-       might_sleep();
        BUG_ON(!level);
        *level = 0xbe;
 
@@ -59,7 +58,6 @@ fakelb_hw_channel(struct ieee802154_hw *hw, u8 page, u8 channel)
 {
        pr_debug("set channel to %d\n", channel);
 
-       might_sleep();
        hw->phy->current_page = page;
        hw->phy->current_channel = channel;
 
@@ -85,8 +83,6 @@ fakelb_hw_xmit(struct ieee802154_hw *hw, struct sk_buff *skb)
        struct fakelb_dev_priv *priv = hw->priv;
        struct fakelb_priv *fake = priv->fake;
 
-       might_sleep();
-
        read_lock_bh(&fake->lock);
        if (priv->list.next == priv->list.prev) {
                /* we are the only one device */