UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

staging: ft1000-pcmcia: delete local_info_t typedef 

Delete local_info_t typedef along with the struct as its "link" member was
not used. Use link->priv to store net_device directly.

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:44 +02:00 committed by Greg Kroah-Hartman
parent 540c44fefd
commit 4370782ee2
1 changed files with 5 additions and 24 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

@ -93,11 +93,6 @@ 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);
typedef struct local_info_t {
struct pcmcia_device *link;
struct net_device *dev;
} local_info_t;
#define MAX_ASIC_RESET_CNT 10 #define MAX_ASIC_RESET_CNT 10
#define COR_DEFAULT 0x55 #define COR_DEFAULT 0x55
@ -115,20 +110,9 @@ static void ft1000_reset(struct pcmcia_device * link)
static int ft1000_attach(struct pcmcia_device *link) static int ft1000_attach(struct pcmcia_device *link)
{ {
local_info_t *local;
DEBUG(0, "ft1000_cs: ft1000_attach()\n"); DEBUG(0, "ft1000_cs: ft1000_attach()\n");
local = kzalloc(sizeof(local_info_t), GFP_KERNEL); link->priv = NULL;
if (!local) {
return -ENOMEM;
}
local->link = link;
link->priv = local;
local->dev = NULL;
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);
@ -146,7 +130,7 @@ static int ft1000_attach(struct pcmcia_device *link)
static void ft1000_detach(struct pcmcia_device *link) static void ft1000_detach(struct pcmcia_device *link)
{ {
struct net_device *dev = ((local_info_t *) link->priv)->dev; struct net_device *dev = link->priv;
DEBUG(0, "ft1000_cs: ft1000_detach(0x%p)\n", link); DEBUG(0, "ft1000_cs: ft1000_detach(0x%p)\n", link);
@ -161,7 +145,6 @@ static void ft1000_detach(struct pcmcia_device *link)
pcmcia_disable_device(link); pcmcia_disable_device(link);
/* This points to the parent local_info_t struct */
free_netdev(dev); free_netdev(dev);
} /* ft1000_detach */ } /* ft1000_detach */
@ -205,9 +188,8 @@ static int ft1000_config(struct pcmcia_device *link)
goto failed; goto failed;
} }
((local_info_t *) link->priv)->dev = init_ft1000_card(link, link->priv = init_ft1000_card(link, &ft1000_reset);
&ft1000_reset); if (link->priv == NULL) {
if (((local_info_t *) link->priv)->dev == NULL) {
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;
} }
@ -244,7 +226,6 @@ static void ft1000_release(struct pcmcia_device * link)
In a normal driver, additional code may be needed to release In a normal driver, additional code may be needed to release
other kernel data structures associated with this device. other kernel data structures associated with this device.
*/ */
kfree((local_info_t *) link->priv);
/* Don't bother checking to see if these succeed or not */ /* Don't bother checking to see if these succeed or not */
pcmcia_disable_device(link); pcmcia_disable_device(link);
@ -264,7 +245,7 @@ static void ft1000_release(struct pcmcia_device * link)
static int ft1000_suspend(struct pcmcia_device *link) static int ft1000_suspend(struct pcmcia_device *link)
{ {
struct net_device *dev = ((local_info_t *) link->priv)->dev; struct net_device *dev = link->priv;
if (link->open) if (link->open)
netif_device_detach(dev); netif_device_detach(dev);