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

Commit 3cad3da3 authored by Julia Lawall's avatar Julia Lawall Committed by Karsten Keil
Browse files

drivers/isdn: Drop unnecessary NULL test 

The result of container_of should not be NULL.  In particular, in this case
the argument to the enclosing function has passed though INIT_WORK, which
dereferences it, implying that its container cannot be NULL.

A simplified version of the semantic patch that makes this change is as
follows:
(http://www.emn.fr/x-info/coccinelle/

)

// <smpl>
@@
identifier fn,work,x,fld;
type T;
expression E1,E2;
statement S;
@@

static fn(struct work_struct *work) {
  ... when != work = E1
  x = container_of(work,T,fld)
  ... when != x = E2
- if (x == NULL) S
  ...
}
// </smpl>

Signed-off-by: default avatarJulia Lawall <julia@diku.dk>
Signed-off-by: default avatarKarsten Keil <keil@b1-systems.de>
parent a900845e

drivers/isdn/hisax/amd7930_fn.c

+0 −2
Original line number Diff line number Diff line
@@ -238,8 +238,6 @@ Amd7930_bh(struct work_struct *work) 
		container_of(work, struct IsdnCardState, tqueue);

        struct PStack *stptr;



	if (!cs)

		return;

	if (test_and_clear_bit(D_CLEARBUSY, &cs->event)) {

                if (cs->debug)

			debugl1(cs, "Amd7930: bh, D-Channel Busy cleared");

drivers/isdn/hisax/hfc_pci.c

+0 −2
Original line number Diff line number Diff line
@@ -1506,8 +1506,6 @@ hfcpci_bh(struct work_struct *work) 
	u_long	flags;

//      struct PStack *stptr;



	if (!cs)

		return;

	if (test_and_clear_bit(D_L1STATECHANGE, &cs->event)) {

		if (!cs->hw.hfcpci.nt_mode)

			switch (cs->dc.hfcpci.ph_state) {

drivers/isdn/hisax/hfc_sx.c

+0 −2
Original line number Diff line number Diff line
@@ -1255,8 +1255,6 @@ hfcsx_bh(struct work_struct *work) 
		container_of(work, struct IsdnCardState, tqueue);

	u_long flags;



	if (!cs)

		return;

	if (test_and_clear_bit(D_L1STATECHANGE, &cs->event)) {

		if (!cs->hw.hfcsx.nt_mode)

			switch (cs->dc.hfcsx.ph_state) {

drivers/isdn/hisax/icc.c

+0 −2
Original line number Diff line number Diff line
@@ -83,8 +83,6 @@ icc_bh(struct work_struct *work) 
		container_of(work, struct IsdnCardState, tqueue);

	struct PStack *stptr;

	

	if (!cs)

		return;

	if (test_and_clear_bit(D_CLEARBUSY, &cs->event)) {

		if (cs->debug)

			debugl1(cs, "D-Channel Busy cleared");

drivers/isdn/hisax/isac.c

+0 −2
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ isac_bh(struct work_struct *work) 
		container_of(work, struct IsdnCardState, tqueue);

	struct PStack *stptr;

	

	if (!cs)

		return;

	if (test_and_clear_bit(D_CLEARBUSY, &cs->event)) {

		if (cs->debug)

			debugl1(cs, "D-Channel Busy cleared");