Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging: ft1000-pcmcia: coding style fixes in ft1000_cs.c

Browse source 
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:
Ondrej Zary 2011-07-01 00:03:52 +02:00 committed by Greg Kroah-Hartman
parent ba5e17e6ab
commit a6b0729186
1 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
View file

@ -63,11 +63,11 @@ void stop_ft1000_card(struct net_device *);
static int ft1000_config(struct pcmcia_device *link); static int ft1000_config(struct pcmcia_device *link);
static void ft1000_release(struct pcmcia_device *link); static void ft1000_release(struct pcmcia_device *link);
static void ft1000_detach(struct pcmcia_device *link); static void ft1000_detach(struct pcmcia_device *link);
static int ft1000_attach(struct pcmcia_device *link); 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); 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; link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO;
return ft1000_config(link); return ft1000_config(link);
} }
static void ft1000_detach(struct pcmcia_device *link) static void ft1000_detach(struct pcmcia_device *link)
{ {
struct net_device *dev = link->priv; struct net_device *dev = link->priv;
if (dev) { if (dev)
stop_ft1000_card(dev); stop_ft1000_card(dev);
}
pcmcia_disable_device(link); pcmcia_disable_device(link);
free_netdev(dev); free_netdev(dev);
} }
int ft1000_confcheck(struct pcmcia_device *link, void *priv_data) int ft1000_confcheck(struct pcmcia_device *link, void *priv_data)
@ -110,7 +106,7 @@ int ft1000_confcheck(struct pcmcia_device *link, void *priv_data)
static int ft1000_config(struct pcmcia_device *link) static int ft1000_config(struct pcmcia_device *link)
{ {
int ret; int ret;
dev_dbg(&link->dev, "ft1000_cs: ft1000_config(0x%p)\n", link); dev_dbg(&link->dev, "ft1000_cs: ft1000_config(0x%p)\n", link);
@ -129,7 +125,7 @@ static int ft1000_config(struct pcmcia_device *link)
} }
link->priv = init_ft1000_card(link, &ft1000_reset); 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"); printk(KERN_INFO "ft1000: Could not register as network device\n");
goto failed; goto failed;
} }
@ -140,7 +136,6 @@ static int ft1000_config(struct pcmcia_device *link)
failed: failed:
ft1000_release(link); ft1000_release(link);
return -ENODEV; return -ENODEV;
} }
/*====================================================================== /*======================================================================
@ -151,7 +146,7 @@ static int ft1000_config(struct pcmcia_device *link)
======================================================================*/ ======================================================================*/
static void ft1000_release(struct pcmcia_device * link) static void ft1000_release(struct pcmcia_device *link)
{ {
pcmcia_disable_device(link); pcmcia_disable_device(link);
} }
@ -182,13 +177,13 @@ static const struct pcmcia_device_id ft1000_ids[] = {
MODULE_DEVICE_TABLE(pcmcia, ft1000_ids); MODULE_DEVICE_TABLE(pcmcia, ft1000_ids);
static struct pcmcia_driver ft1000_cs_driver = { static struct pcmcia_driver ft1000_cs_driver = {
.owner = THIS_MODULE, .owner = THIS_MODULE,
.name = "ft1000_cs", .name = "ft1000_cs",
.probe = ft1000_attach, .probe = ft1000_attach,
.remove = ft1000_detach, .remove = ft1000_detach,
.id_table = ft1000_ids, .id_table = ft1000_ids,
.suspend = ft1000_suspend, .suspend = ft1000_suspend,
.resume = ft1000_resume, .resume = ft1000_resume,
}; };
static int __init init_ft1000_cs(void) static int __init init_ft1000_cs(void)