Skip to content

Commit

Permalink
drivers/isdn/hisax: Drop unused list
Browse files Browse the repository at this point in the history
The file st5481_init.c locally defines and initializes the adapter_list
variable, but does not use it for anything.  Removing the list makes it
possible to remove the list field from the st5481_adapter data structure.
In the function probe_st5481, it also makes it possible to free the locally
allocated adapter value on an error exit.

Signed-off-by: Julia Lawall <julia@diku.dk>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Julia Lawall authored and David S. Miller committed May 13, 2011
1 parent c319b4d commit 5310cbc
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 6 deletions.
1 change: 0 additions & 1 deletion drivers/isdn/hisax/st5481.h
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,6 @@ struct st5481_bcs {
};

struct st5481_adapter {
struct list_head list;
int number_of_leds;
struct usb_device *usb_dev;
struct hisax_d_if hisax_d_if;
Expand Down
6 changes: 1 addition & 5 deletions drivers/isdn/hisax/st5481_init.c
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,6 @@ module_param(debug, int, 0);
#endif
int st5481_debug;

static LIST_HEAD(adapter_list);

/* ======================================================================
* registration/deregistration with the USB layer
*/
Expand Down Expand Up @@ -86,7 +84,6 @@ static int probe_st5481(struct usb_interface *intf,
adapter->bcs[i].b_if.ifc.priv = &adapter->bcs[i];
adapter->bcs[i].b_if.ifc.l2l1 = st5481_b_l2l1;
}
list_add(&adapter->list, &adapter_list);

retval = st5481_setup_usb(adapter);
if (retval < 0)
Expand Down Expand Up @@ -125,6 +122,7 @@ static int probe_st5481(struct usb_interface *intf,
err_usb:
st5481_release_usb(adapter);
err:
kfree(adapter);
return -EIO;
}

Expand All @@ -142,8 +140,6 @@ static void disconnect_st5481(struct usb_interface *intf)
if (!adapter)
return;

list_del(&adapter->list);

st5481_stop(adapter);
st5481_release_b(&adapter->bcs[1]);
st5481_release_b(&adapter->bcs[0]);
Expand Down

0 comments on commit 5310cbc

Please sign in to comment.