dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
sjur.brandeland@stericsson.com 2011-11-30 09:22:48 +00:00 committed by David S. Miller
parent 7c18d2205e
commit e977b4cf63
4 changed files with 4 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
include/net/caif/cfcnfg.h
View File

@ -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.

4
include/net/caif/cfserl.h
View File

@ -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

2
net/caif/caif_dev.c
View File

@ -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;

3
net/caif/cfserl.c
View File

@ -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");