summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorsjur.brandeland@stericsson.com <sjur.brandeland@stericsson.com>2011-11-30 10:22:48 +0100
committerDavid S. Miller <davem@davemloft.net>2011-12-01 05:30:48 +0100
commite977b4cf637ebb545db14bff76d590490b2fb4bf (patch)
tree97be37eb44c04150cfc521ebbf6f88a5b0ea9efb /net
parentcaif: Restructure how link caif link layer enroll (diff)
downloadlinux-e977b4cf637ebb545db14bff76d590490b2fb4bf.tar.xz
linux-e977b4cf637ebb545db14bff76d590490b2fb4bf.zip
caif: Remove unused enum and parameter in cfserl
Remove unused enum cfcnfg_phy_type and the parameter to cfserl_create. Signed-off-by: Sjur Brændeland <sjur.brandeland@stericsson.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r--net/caif/caif_dev.c2
-rw-r--r--net/caif/cfserl.c3
2 files changed, 2 insertions, 3 deletions
diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
index 70034c017825..f7e8c70b343c 100644
--- a/net/caif/caif_dev.c
+++ b/net/caif/caif_dev.c
@@ -295,7 +295,7 @@ static int caif_device_notify(struct notifier_block *me, unsigned long what,
if (caifdev->use_frag) {
head_room = 1;
link_support = cfserl_create(dev->ifindex,
- CFPHYTYPE_FRAG, caifdev->use_stx);
+ caifdev->use_stx);
if (!link_support) {
pr_warn("Out of memory\n");
break;
diff --git a/net/caif/cfserl.c b/net/caif/cfserl.c
index 797c8d165993..8e68b97f13ee 100644
--- 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");