Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

sjur.brandeland@stericsson.com and committed by
David S. Miller
e977b4cf 7c18d220

+4 -19
-14
include/net/caif/cfcnfg.h
··· 14 14 struct cfcnfg; 15 15 16 16 /** 17 - * enum cfcnfg_phy_type - Types of physical layers defined in CAIF Stack 18 - * 19 - * @CFPHYTYPE_FRAG: Fragmented frames physical interface. 20 - * @CFPHYTYPE_CAIF: Generic CAIF physical interface 21 - */ 22 - enum cfcnfg_phy_type { 23 - CFPHYTYPE_FRAG = 1, 24 - CFPHYTYPE_CAIF, 25 - CFPHYTYPE_MAX 26 - }; 27 - 28 - /** 29 17 * enum cfcnfg_phy_preference - Physical preference HW Abstraction 30 18 * 31 19 * @CFPHYPREF_UNSPECIFIED: Default physical interface ··· 54 66 * cfcnfg_add_phy_layer() - Adds a physical layer to the CAIF stack. 55 67 * @cnfg: Pointer to a CAIF configuration object, created by 56 68 * cfcnfg_create(). 57 - * @phy_type: Specifies the type of physical interface, e.g. 58 - * CFPHYTYPE_FRAG. 59 69 * @dev: Pointer to link layer device 60 70 * @phy_layer: Specify the physical layer. The transmit function 61 71 * MUST be set in the structure.
+2 -2
include/net/caif/cfserl.h
··· 8 8 #define CFSERL_H_ 9 9 #include <net/caif/caif_layer.h> 10 10 11 - struct cflayer *cfserl_create(int type, int instance, bool use_stx); 12 - #endif /* CFSERL_H_ */ 11 + struct cflayer *cfserl_create(int instance, bool use_stx); 12 + #endif
+1 -1
net/caif/caif_dev.c
··· 295 295 if (caifdev->use_frag) { 296 296 head_room = 1; 297 297 link_support = cfserl_create(dev->ifindex, 298 - CFPHYTYPE_FRAG, caifdev->use_stx); 298 + caifdev->use_stx); 299 299 if (!link_support) { 300 300 pr_warn("Out of memory\n"); 301 301 break;
+1 -2
net/caif/cfserl.c
··· 31 31 static void cfserl_ctrlcmd(struct cflayer *layr, enum caif_ctrlcmd ctrl, 32 32 int phyid); 33 33 34 - struct cflayer *cfserl_create(int type, int instance, bool use_stx) 34 + struct cflayer *cfserl_create(int instance, bool use_stx) 35 35 { 36 36 struct cfserl *this = kzalloc(sizeof(struct cfserl), GFP_ATOMIC); 37 37 if (!this) ··· 40 40 this->layer.receive = cfserl_receive; 41 41 this->layer.transmit = cfserl_transmit; 42 42 this->layer.ctrlcmd = cfserl_ctrlcmd; 43 - this->layer.type = type; 44 43 this->usestx = use_stx; 45 44 spin_lock_init(&this->sync); 46 45 snprintf(this->layer.name, CAIF_LAYER_NAME_SZ, "ser1");