Merge tag 'stable/for-linus-3.8-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel...

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / net / caif / cfserl.c

diff --git a/net/caif/cfserl.c b/net/caif/cfserl.c
index 797c8d165993f556b954b6c7aea9fd31540adbe0..8e68b97f13ee71c23186fac06573590ae3664f78 100644 (file)
--- a/net/caif/cfserl.c
+++ b/net/caif/cfserl.c
@@ -31,7 +31,7 @@ static int cfserl_transmit(struct cflayer *layr, struct cfpkt *pkt);
 static void cfserl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
                                int phyid);
 
-struct cflayer *cfserl_create(int type, int instance, bool use_stx)
+struct cflayer *cfserl_create(int instance, bool use_stx)
 {
        struct cfserl *this = kzalloc(sizeof(struct cfserl), GFP_ATOMIC);
        if (!this)
@@ -40,7 +40,6 @@ struct cflayer *cfserl_create(int type, int instance, bool use_stx)
        this->layer.receive = cfserl_receive;
        this->layer.transmit = cfserl_transmit;
        this->layer.ctrlcmd = cfserl_ctrlcmd;
-       this->layer.type = type;
        this->usestx = use_stx;
        spin_lock_init(&this->sync);
        snprintf(this->layer.name, CAIF_LAYER_NAME_SZ, "ser1");