Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e977b4cf authored by sjur.brandeland@stericsson.com's avatar sjur.brandeland@stericsson.com Committed by David S. Miller
Browse files

caif: Remove unused enum and parameter in cfserl 



Remove unused enum cfcnfg_phy_type and the parameter to cfserl_create.

Signed-off-by: default avatarSjur Brændeland <sjur.brandeland@stericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7c18d220

include/net/caif/cfcnfg.h

+0 −14
Original line number Diff line number Diff line
@@ -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.

include/net/caif/cfserl.h

+2 −2
Original line number Diff line number Diff line
@@ -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

net/caif/caif_dev.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

net/caif/cfserl.c

+1 −2
Original line number Diff line number Diff line
@@ -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");