Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e37d2ec8 authored by Alexander Aring's avatar Alexander Aring Committed by Marcel Holtmann
Browse files

mac802154: ops: declare channel and page as u8 



The range of channel and page fits into an unsigned byte range. This
patch changes the set_channel parameter definitions for channel and
page to u8.

Signed-off-by: default avatarAlexander Aring <alex.aring@gmail.com>
Cc: Alan Ott <alan@signal11.us>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 16301861

drivers/net/ieee802154/at86rf230.c

+4 −4
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ struct at86rf2xx_chip_data { 
	u16 t_tx_timeout;

	int rssi_base_val;



	int (*set_channel)(struct at86rf230_local *, int, int);

	int (*set_channel)(struct at86rf230_local *, u8, u8);

	int (*get_desense_steps)(struct at86rf230_local *, s32);

};
@@ -1012,13 +1012,13 @@ at86rf230_stop(struct ieee802154_hw *hw) 
}



static int

at86rf23x_set_channel(struct at86rf230_local *lp, int page, int channel)

at86rf23x_set_channel(struct at86rf230_local *lp, u8 page, u8 channel)

{

	return at86rf230_write_subreg(lp, SR_CHANNEL, channel);

}



static int

at86rf212_set_channel(struct at86rf230_local *lp, int page, int channel)

at86rf212_set_channel(struct at86rf230_local *lp, u8 page, u8 channel)

{

	int rc;
@@ -1043,7 +1043,7 @@ at86rf212_set_channel(struct at86rf230_local *lp, int page, int channel) 
}



static int

at86rf230_channel(struct ieee802154_hw *hw, int page, int channel)

at86rf230_channel(struct ieee802154_hw *hw, u8 page, u8 channel)

{

	struct at86rf230_local *lp = hw->priv;

	int rc;

drivers/net/ieee802154/cc2520.c

+1 −1
Original line number Diff line number Diff line
@@ -569,7 +569,7 @@ cc2520_ed(struct ieee802154_hw *hw, u8 *level) 
}



static int

cc2520_set_channel(struct ieee802154_hw *hw, int page, int channel)

cc2520_set_channel(struct ieee802154_hw *hw, u8 page, u8 channel)

{

	struct cc2520_private *priv = hw->priv;

	int ret;

drivers/net/ieee802154/fakelb.c

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ fakelb_hw_ed(struct ieee802154_hw *hw, u8 *level) 
}



static int

fakelb_hw_channel(struct ieee802154_hw *hw, int page, int channel)

fakelb_hw_channel(struct ieee802154_hw *hw, u8 page, u8 channel)

{

	pr_debug("set channel to %d\n", channel);

drivers/net/ieee802154/mrf24j40.c

+1 −2
Original line number Diff line number Diff line
@@ -423,8 +423,7 @@ static void mrf24j40_stop(struct ieee802154_hw *hw) 
	write_short_reg(devrec, REG_INTCON, val);

}



static int mrf24j40_set_channel(struct ieee802154_hw *hw,

				int page, int channel)

static int mrf24j40_set_channel(struct ieee802154_hw *hw, u8 page, u8 channel)

{

	struct mrf24j40 *devrec = hw->priv;

	u8 val;

include/net/mac802154.h

+2 −3
Original line number Diff line number Diff line
@@ -178,9 +178,8 @@ struct ieee802154_ops { 
	int		(*xmit_async)(struct ieee802154_hw *hw,

				      struct sk_buff *skb);

	int		(*ed)(struct ieee802154_hw *hw, u8 *level);

	int		(*set_channel)(struct ieee802154_hw *hw,

				       int page,

				       int channel);

	int		(*set_channel)(struct ieee802154_hw *hw, u8 page,

				       u8 channel);

	int		(*set_hw_addr_filt)(struct ieee802154_hw *hw,

					    struct ieee802154_hw_addr_filt *filt,

					    unsigned long changed);