mirror of
https://github.com/torvalds/linux.git
synced 2024-12-24 20:01:55 +00:00
staging: ft1000-pcmcia: coding style fixes in ft1000_cs.c
Minor coding style fixes in ft1000_cs.c Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
ba5e17e6ab
commit
a6b0729186
@ -67,7 +67,7 @@ static int ft1000_attach(struct pcmcia_device *link);
|
||||
|
||||
/*====================================================================*/
|
||||
|
||||
static void ft1000_reset(struct pcmcia_device * link)
|
||||
static void ft1000_reset(struct pcmcia_device *link)
|
||||
{
|
||||
pcmcia_reset_card(link->socket);
|
||||
}
|
||||
@ -78,21 +78,17 @@ static int ft1000_attach(struct pcmcia_device *link)
|
||||
link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
|
||||
|
||||
return ft1000_config(link);
|
||||
|
||||
}
|
||||
|
||||
static void ft1000_detach(struct pcmcia_device *link)
|
||||
{
|
||||
struct net_device *dev = link->priv;
|
||||
|
||||
if (dev) {
|
||||
if (dev)
|
||||
stop_ft1000_card(dev);
|
||||
}
|
||||
|
||||
pcmcia_disable_device(link);
|
||||
|
||||
free_netdev(dev);
|
||||
|
||||
}
|
||||
|
||||
int ft1000_confcheck(struct pcmcia_device *link, void *priv_data)
|
||||
@ -129,7 +125,7 @@ static int ft1000_config(struct pcmcia_device *link)
|
||||
}
|
||||
|
||||
link->priv = init_ft1000_card(link, &ft1000_reset);
|
||||
if (link->priv == NULL) {
|
||||
if (!link->priv) {
|
||||
printk(KERN_INFO "ft1000: Could not register as network device\n");
|
||||
goto failed;
|
||||
}
|
||||
@ -140,7 +136,6 @@ static int ft1000_config(struct pcmcia_device *link)
|
||||
failed:
|
||||
ft1000_release(link);
|
||||
return -ENODEV;
|
||||
|
||||
}
|
||||
|
||||
/*======================================================================
|
||||
@ -151,7 +146,7 @@ failed:
|
||||
|
||||
======================================================================*/
|
||||
|
||||
static void ft1000_release(struct pcmcia_device * link)
|
||||
static void ft1000_release(struct pcmcia_device *link)
|
||||
{
|
||||
pcmcia_disable_device(link);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user