Skip to content

Commit 38ed18f

Browse files
heicarstdavem330
authored andcommitted
claw: remove unused return code handling
Remove unused return code handling. The claw driver is mostly dead, so just make sure it keeps compiling without warnings. Signed-off-by: Heiko Carstens <[email protected]> Signed-off-by: Frank Blaschka <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 3e70b3b commit 38ed18f

File tree

1 file changed

+3
-19
lines changed

1 file changed

+3
-19
lines changed

drivers/s390/net/claw.c

Lines changed: 3 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -845,12 +845,10 @@ claw_irq_tasklet ( unsigned long data )
845845
{
846846
struct chbk * p_ch;
847847
struct net_device *dev;
848-
struct claw_privbk * privptr;
849848

850849
p_ch = (struct chbk *) data;
851850
dev = (struct net_device *)p_ch->ndev;
852851
CLAW_DBF_TEXT(4, trace, "IRQtask");
853-
privptr = (struct claw_privbk *)dev->ml_priv;
854852
unpack_read(dev);
855853
clear_bit(CLAW_BH_ACTIVE, (void *)&p_ch->flag_a);
856854
CLAW_DBF_TEXT(4, trace, "TskletXt");
@@ -1026,7 +1024,6 @@ claw_write_next ( struct chbk * p_ch )
10261024
struct net_device *dev;
10271025
struct claw_privbk *privptr=NULL;
10281026
struct sk_buff *pk_skb;
1029-
int rc;
10301027

10311028
CLAW_DBF_TEXT(4, trace, "claw_wrt");
10321029
if (p_ch->claw_state == CLAW_STOP)
@@ -1038,7 +1035,7 @@ claw_write_next ( struct chbk * p_ch )
10381035
!skb_queue_empty(&p_ch->collect_queue)) {
10391036
pk_skb = claw_pack_skb(privptr);
10401037
while (pk_skb != NULL) {
1041-
rc = claw_hw_tx( pk_skb, dev,1);
1038+
claw_hw_tx(pk_skb, dev, 1);
10421039
if (privptr->write_free_count > 0) {
10431040
pk_skb = claw_pack_skb(privptr);
10441041
} else
@@ -1322,15 +1319,12 @@ claw_hw_tx(struct sk_buff *skb, struct net_device *dev, long linkid)
13221319
unsigned char *pDataAddress;
13231320
struct endccw *pEnd;
13241321
struct ccw1 tempCCW;
1325-
struct chbk *p_ch;
13261322
struct claw_env *p_env;
1327-
int lock;
13281323
struct clawph *pk_head;
13291324
struct chbk *ch;
13301325

13311326
CLAW_DBF_TEXT(4, trace, "hw_tx");
13321327
privptr = (struct claw_privbk *)(dev->ml_priv);
1333-
p_ch = (struct chbk *)&privptr->channel[WRITE_CHANNEL];
13341328
p_env =privptr->p_env;
13351329
claw_free_wrt_buf(dev); /* Clean up free chain if posible */
13361330
/* scan the write queue to free any completed write packets */
@@ -1511,12 +1505,6 @@ claw_hw_tx(struct sk_buff *skb, struct net_device *dev, long linkid)
15111505

15121506
} /* endif (p_first_ccw!=NULL) */
15131507
dev_kfree_skb_any(skb);
1514-
if (linkid==0) {
1515-
lock=LOCK_NO;
1516-
}
1517-
else {
1518-
lock=LOCK_YES;
1519-
}
15201508
claw_strt_out_IO(dev );
15211509
/* if write free count is zero , set NOBUFFER */
15221510
if (privptr->write_free_count==0) {
@@ -2821,15 +2809,11 @@ claw_free_wrt_buf( struct net_device *dev )
28212809
{
28222810

28232811
struct claw_privbk *privptr = (struct claw_privbk *)dev->ml_priv;
2824-
struct ccwbk*p_first_ccw;
2825-
struct ccwbk*p_last_ccw;
28262812
struct ccwbk*p_this_ccw;
28272813
struct ccwbk*p_next_ccw;
28282814

28292815
CLAW_DBF_TEXT(4, trace, "freewrtb");
28302816
/* scan the write queue to free any completed write packets */
2831-
p_first_ccw=NULL;
2832-
p_last_ccw=NULL;
28332817
p_this_ccw=privptr->p_write_active_first;
28342818
while ( (p_this_ccw!=NULL) && (p_this_ccw->header.flag!=CLAW_PENDING))
28352819
{
@@ -3072,7 +3056,7 @@ claw_shutdown_device(struct ccwgroup_device *cgdev)
30723056
{
30733057
struct claw_privbk *priv;
30743058
struct net_device *ndev;
3075-
int ret;
3059+
int ret = 0;
30763060

30773061
CLAW_DBF_TEXT_(2, setup, "%s", dev_name(&cgdev->dev));
30783062
priv = dev_get_drvdata(&cgdev->dev);
@@ -3095,7 +3079,7 @@ claw_shutdown_device(struct ccwgroup_device *cgdev)
30953079
}
30963080
ccw_device_set_offline(cgdev->cdev[1]);
30973081
ccw_device_set_offline(cgdev->cdev[0]);
3098-
return 0;
3082+
return ret;
30993083
}
31003084

31013085
static void

0 commit comments

Comments
 (0)