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: Sudip Mukherjee <sudip.mukherjee@codethink.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/i4l/act2000/capi.c b/drivers/staging/i4l/act2000/capi.c
index 3f66ca20b5e544e3c0593f91cdf5c3e5139f894e..41b4d191c215a275ef447058bc36093bc34786c6 100644 (file)
--- a/drivers/staging/i4l/act2000/capi.c
+++ b/drivers/staging/i4l/act2000/capi.c
@@ -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;

diff --git a/drivers/staging/i4l/act2000/capi.h b/drivers/staging/i4l/act2000/capi.h
index 01ccdecd43f76920435b17365c7a5e950d4edf65..7d0f52db7fa5d44a9b54a2ee9489033d97ef9c3e 100644 (file)
--- a/drivers/staging/i4l/act2000/capi.h
+++ b/drivers/staging/i4l/act2000/capi.h
@@ -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;         \
        }