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

Commit f775252f authored by Sudip Mukherjee's avatar Sudip Mukherjee Committed by Greg Kroah-Hartman
Browse files

staging: i4l: act2000: remove unused argument 



The macro EVAL_NCCI was only being used in capi.c and the argument
controller was not used. Remove the argument and at the same time
remove the variable which now becomes unused.

Signed-off-by: default avatarSudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b91796e8

drivers/staging/i4l/act2000/capi.c

+1 −2
Original line number Diff line number Diff line
@@ -547,12 +547,11 @@ static int 
actcapi_data_b3_ind(act2000_card *card, struct sk_buff *skb) {

	__u16 plci;

	__u16 ncci;

	__u16 controller;

	__u8  blocknr;

	int chan;

	actcapi_msg *msg = (actcapi_msg *)skb->data;



	EVAL_NCCI(msg->msg.data_b3_ind.fakencci, plci, controller, ncci);

	EVAL_NCCI(msg->msg.data_b3_ind.fakencci, plci, ncci);

	chan = find_ncci(card, ncci);

	if (chan < 0)

		return 0;

drivers/staging/i4l/act2000/capi.h

+1 −2
Original line number Diff line number Diff line
@@ -114,9 +114,8 @@ typedef struct actcapi_ncpd { 
#define MAKE_NCCI(plci, contr, ncci)					\

	((plci & 0x1f) | ((contr & 0x7) << 5) | ((ncci & 0xff) << 8))



#define EVAL_NCCI(fakencci, plci, contr, ncci) {	\

#define EVAL_NCCI(fakencci, plci, ncci) {	\

		plci  = fakencci & 0x1f;		\

		contr = (fakencci >> 5) & 0x7;		\

		ncci  = (fakencci >> 8) & 0xff;		\

	}