From: Ondrej Zary Date: Thu, 30 Jun 2011 22:03:54 +0000 (+0200) Subject: staging: ft1000-pcmcia: remove useless ft1000_release() function X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=331eae6c84bcc22ab76c5a5045dbd068373bf9ba;p=linux-beck.git staging: ft1000-pcmcia: remove useless ft1000_release() function Remove useless ft1000_release() function. Signed-off-by: Ondrej Zary Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c index 13b6837ffa01..6a1c1d4dcca2 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c @@ -46,7 +46,6 @@ struct net_device *init_ft1000_card(struct pcmcia_device *link, void stop_ft1000_card(struct net_device *); static int ft1000_config(struct pcmcia_device *link); -static void ft1000_release(struct pcmcia_device *link); static void ft1000_detach(struct pcmcia_device *link); static int ft1000_attach(struct pcmcia_device *link); @@ -119,23 +118,10 @@ static int ft1000_config(struct pcmcia_device *link) return 0; failed: - ft1000_release(link); + pcmcia_disable_device(link); return -ENODEV; } -/*====================================================================== - - After a card is removed, ft1000_release() will unregister the - device, and release the PCMCIA configuration. If the device is - still open, this will be postponed until it is closed. - -======================================================================*/ - -static void ft1000_release(struct pcmcia_device *link) -{ - pcmcia_disable_device(link); -} - static int ft1000_suspend(struct pcmcia_device *link) { struct net_device *dev = link->priv;