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>

diff --git a/include/net/caif/cfcnfg.h b/include/net/caif/cfcnfg.h
index a421723e986f710b64a6782763f366cbd4a57501..90b4ff8bad838819d62d5a230bd970090b0e8808 100644 (file)
--- a/include/net/caif/cfcnfg.h
+++ b/include/net/caif/cfcnfg.h
@@ -13,18 +13,6 @@
 
 struct cfcnfg;
 
-/**
- * enum cfcnfg_phy_type -  Types of physical layers defined in CAIF Stack
- *
- * @CFPHYTYPE_FRAG:    Fragmented frames physical interface.
- * @CFPHYTYPE_CAIF:    Generic CAIF physical interface
- */
-enum cfcnfg_phy_type {
-       CFPHYTYPE_FRAG = 1,
-       CFPHYTYPE_CAIF,
-       CFPHYTYPE_MAX
-};
-
 /**
  * enum cfcnfg_phy_preference - Physical preference HW Abstraction
  *
@@ -66,8 +54,6 @@ void cfcnfg_remove(struct cfcnfg *cfg);
  * cfcnfg_add_phy_layer() - Adds a physical layer to the CAIF stack.
  * @cnfg:      Pointer to a CAIF configuration object, created by
  *             cfcnfg_create().
- * @phy_type:  Specifies the type of physical interface, e.g.
- *                     CFPHYTYPE_FRAG.
  * @dev:       Pointer to link layer device
  * @phy_layer: Specify the physical layer. The transmit function
  *             MUST be set in the structure.

diff --git a/include/net/caif/cfserl.h b/include/net/caif/cfserl.h
index b8374321b362f0726ed3a3d0bfb1c95210cad620..f121299a34272f014c61b3f3996964b313b9bde3 100644 (file)
--- a/include/net/caif/cfserl.h
+++ b/include/net/caif/cfserl.h
@@ -8,5 +8,5 @@
 #define CFSERL_H_
 #include <net/caif/caif_layer.h>
 
-struct cflayer *cfserl_create(int type, int instance, bool use_stx);
-#endif                         /* CFSERL_H_ */
+struct cflayer *cfserl_create(int instance, bool use_stx);
+#endif

diff --git a/net/caif/caif_dev.c b/net/caif/caif_dev.c
index 70034c01782518834f2e6168849727f982c5ca86..f7e8c70b343cdae4228d4d1dda8528d246b165f1 100644 (file)
--- 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 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");