diff options
author | Ondrej Zary <linux@rainbow-software.org> | 2011-06-30 18:03:52 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-07-05 13:32:34 -0400 |
commit | a6b072918676225f9415cc4ba4ca84814f83eed2 (patch) | |
tree | 068617e502535cb1e8ebb0ad1b66f845a1149afa /drivers/staging/ft1000 | |
parent | ba5e17e6abae1669f9ed1d63798273617dc2992e (diff) |
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>
Diffstat (limited to 'drivers/staging/ft1000')
-rw-r--r-- | drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c index 34fc21f82cb..9a54c8475a5 100644 --- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c +++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c | |||
@@ -63,11 +63,11 @@ void stop_ft1000_card(struct net_device *); | |||
63 | static int ft1000_config(struct pcmcia_device *link); | 63 | static int ft1000_config(struct pcmcia_device *link); |
64 | static void ft1000_release(struct pcmcia_device *link); | 64 | static void ft1000_release(struct pcmcia_device *link); |
65 | static void ft1000_detach(struct pcmcia_device *link); | 65 | static void ft1000_detach(struct pcmcia_device *link); |
66 | static int ft1000_attach(struct pcmcia_device *link); | 66 | static int ft1000_attach(struct pcmcia_device *link); |
67 | 67 | ||
68 | /*====================================================================*/ | 68 | /*====================================================================*/ |
69 | 69 | ||
70 | static void ft1000_reset(struct pcmcia_device * link) | 70 | static void ft1000_reset(struct pcmcia_device *link) |
71 | { | 71 | { |
72 | pcmcia_reset_card(link->socket); | 72 | pcmcia_reset_card(link->socket); |
73 | } | 73 | } |
@@ -78,21 +78,17 @@ static int ft1000_attach(struct pcmcia_device *link) | |||
78 | link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO; | 78 | link->config_flags |= CONF_ENABLE_IRQ | CONF_AUTO_SET_IO; |
79 | 79 | ||
80 | return ft1000_config(link); | 80 | return ft1000_config(link); |
81 | |||
82 | } | 81 | } |
83 | 82 | ||
84 | static void ft1000_detach(struct pcmcia_device *link) | 83 | static void ft1000_detach(struct pcmcia_device *link) |
85 | { | 84 | { |
86 | struct net_device *dev = link->priv; | 85 | struct net_device *dev = link->priv; |
87 | 86 | ||
88 | if (dev) { | 87 | if (dev) |
89 | stop_ft1000_card(dev); | 88 | stop_ft1000_card(dev); |
90 | } | ||
91 | 89 | ||
92 | pcmcia_disable_device(link); | 90 | pcmcia_disable_device(link); |
93 | |||
94 | free_netdev(dev); | 91 | free_netdev(dev); |
95 | |||
96 | } | 92 | } |
97 | 93 | ||
98 | int ft1000_confcheck(struct pcmcia_device *link, void *priv_data) | 94 | int ft1000_confcheck(struct pcmcia_device *link, void *priv_data) |
@@ -110,7 +106,7 @@ int ft1000_confcheck(struct pcmcia_device *link, void *priv_data) | |||
110 | 106 | ||
111 | static int ft1000_config(struct pcmcia_device *link) | 107 | static int ft1000_config(struct pcmcia_device *link) |
112 | { | 108 | { |
113 | int ret; | 109 | int ret; |
114 | 110 | ||
115 | dev_dbg(&link->dev, "ft1000_cs: ft1000_config(0x%p)\n", link); | 111 | dev_dbg(&link->dev, "ft1000_cs: ft1000_config(0x%p)\n", link); |
116 | 112 | ||
@@ -129,7 +125,7 @@ static int ft1000_config(struct pcmcia_device *link) | |||
129 | } | 125 | } |
130 | 126 | ||
131 | link->priv = init_ft1000_card(link, &ft1000_reset); | 127 | link->priv = init_ft1000_card(link, &ft1000_reset); |
132 | if (link->priv == NULL) { | 128 | if (!link->priv) { |
133 | printk(KERN_INFO "ft1000: Could not register as network device\n"); | 129 | printk(KERN_INFO "ft1000: Could not register as network device\n"); |
134 | goto failed; | 130 | goto failed; |
135 | } | 131 | } |
@@ -140,7 +136,6 @@ static int ft1000_config(struct pcmcia_device *link) | |||
140 | failed: | 136 | failed: |
141 | ft1000_release(link); | 137 | ft1000_release(link); |
142 | return -ENODEV; | 138 | return -ENODEV; |
143 | |||
144 | } | 139 | } |
145 | 140 | ||
146 | /*====================================================================== | 141 | /*====================================================================== |
@@ -151,7 +146,7 @@ failed: | |||
151 | 146 | ||
152 | ======================================================================*/ | 147 | ======================================================================*/ |
153 | 148 | ||
154 | static void ft1000_release(struct pcmcia_device * link) | 149 | static void ft1000_release(struct pcmcia_device *link) |
155 | { | 150 | { |
156 | pcmcia_disable_device(link); | 151 | pcmcia_disable_device(link); |
157 | } | 152 | } |
@@ -182,13 +177,13 @@ static const struct pcmcia_device_id ft1000_ids[] = { | |||
182 | MODULE_DEVICE_TABLE(pcmcia, ft1000_ids); | 177 | MODULE_DEVICE_TABLE(pcmcia, ft1000_ids); |
183 | 178 | ||
184 | static struct pcmcia_driver ft1000_cs_driver = { | 179 | static struct pcmcia_driver ft1000_cs_driver = { |
185 | .owner = THIS_MODULE, | 180 | .owner = THIS_MODULE, |
186 | .name = "ft1000_cs", | 181 | .name = "ft1000_cs", |
187 | .probe = ft1000_attach, | 182 | .probe = ft1000_attach, |
188 | .remove = ft1000_detach, | 183 | .remove = ft1000_detach, |
189 | .id_table = ft1000_ids, | 184 | .id_table = ft1000_ids, |
190 | .suspend = ft1000_suspend, | 185 | .suspend = ft1000_suspend, |
191 | .resume = ft1000_resume, | 186 | .resume = ft1000_resume, |
192 | }; | 187 | }; |
193 | 188 | ||
194 | static int __init init_ft1000_cs(void) | 189 | static int __init init_ft1000_cs(void) |