aboutsummaryrefslogtreecommitdiffstats
path: root/net/caif
diff options
context:
space:
mode:
authorsjur.brandeland@stericsson.com <sjur.brandeland@stericsson.com>2011-11-30 04:22:48 -0500
committerDavid S. Miller <davem@davemloft.net>2011-11-30 23:30:48 -0500
commite977b4cf637ebb545db14bff76d590490b2fb4bf (patch)
tree97be37eb44c04150cfc521ebbf6f88a5b0ea9efb /net/caif
parent7c18d2205ea76eef9674e59e1ecae4f332a53e9e (diff)
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/caif')
-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,
295 if (caifdev->use_frag) { 295 if (caifdev->use_frag) {
296 head_room = 1; 296 head_room = 1;
297 link_support = cfserl_create(dev->ifindex, 297 link_support = cfserl_create(dev->ifindex,
298 CFPHYTYPE_FRAG, caifdev->use_stx); 298 caifdev->use_stx);
299 if (!link_support) { 299 if (!link_support) {
300 pr_warn("Out of memory\n"); 300 pr_warn("Out of memory\n");
301 break; 301 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);
31static void cfserl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl, 31static void cfserl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl,
32 int phyid); 32 int phyid);
33 33
34struct cflayer *cfserl_create(int type, int instance, bool use_stx) 34struct cflayer *cfserl_create(int instance, bool use_stx)
35{ 35{
36 struct cfserl *this = kzalloc(sizeof(struct cfserl), GFP_ATOMIC); 36 struct cfserl *this = kzalloc(sizeof(struct cfserl), GFP_ATOMIC);
37 if (!this) 37 if (!this)
@@ -40,7 +40,6 @@ struct cflayer *cfserl_create(int type, int instance, bool use_stx)
40 this->layer.receive = cfserl_receive; 40 this->layer.receive = cfserl_receive;
41 this->layer.transmit = cfserl_transmit; 41 this->layer.transmit = cfserl_transmit;
42 this->layer.ctrlcmd = cfserl_ctrlcmd; 42 this->layer.ctrlcmd = cfserl_ctrlcmd;
43 this->layer.type = type;
44 this->usestx = use_stx; 43 this->usestx = use_stx;
45 spin_lock_init(&this->sync); 44 spin_lock_init(&this->sync);
46 snprintf(this->layer.name, CAIF_LAYER_NAME_SZ, "ser1"); 45 snprintf(this->layer.name, CAIF_LAYER_NAME_SZ, "ser1");