From: Ondrej Zary <linux@rainbow-software.org>
To: "Greg Kroah-Hartman" <greg@kroah.com>
Cc: Marek Belisko <marek.belisko@gmail.com>,
Kernel development list <linux-kernel@vger.kernel.org>
Subject: [PATCH 23/28] staging: ft1000-pcmcia: coding style fixes in ft1000_cs.c
Date: Fri, 1 Jul 2011 00:03:52 +0200 [thread overview]
Message-ID: <1309471437-12633-24-git-send-email-linux@rainbow-software.org> (raw)
In-Reply-To: <1309471437-12633-1-git-send-email-linux@rainbow-software.org>
Minor coding style fixes in ft1000_cs.c
Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
---
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 34fc21f..9a54c84 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 *);
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);
+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)
@@ -110,7 +106,7 @@ int ft1000_confcheck(struct pcmcia_device *link, void *priv_data)
static int ft1000_config(struct pcmcia_device *link)
{
- int ret;
+ int ret;
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);
- 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);
}
@@ -182,13 +177,13 @@ static const struct pcmcia_device_id ft1000_ids[] = {
MODULE_DEVICE_TABLE(pcmcia, ft1000_ids);
static struct pcmcia_driver ft1000_cs_driver = {
- .owner = THIS_MODULE,
- .name = "ft1000_cs",
- .probe = ft1000_attach,
- .remove = ft1000_detach,
+ .owner = THIS_MODULE,
+ .name = "ft1000_cs",
+ .probe = ft1000_attach,
+ .remove = ft1000_detach,
.id_table = ft1000_ids,
- .suspend = ft1000_suspend,
- .resume = ft1000_resume,
+ .suspend = ft1000_suspend,
+ .resume = ft1000_resume,
};
static int __init init_ft1000_cs(void)
--
Ondrej Zary
next prev parent reply other threads:[~2011-06-30 22:09 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-30 22:03 [PATCH 00/28] staging: ft1000-pcmcia: various fixes Ondrej Zary
2011-06-30 22:03 ` [PATCH 01/28] staging: ft1000-pcmcia: don't crash on load Ondrej Zary
2011-06-30 22:03 ` [PATCH 02/28] staging: ft1000-pcmcia: fix compilation with FT_DEBUG enabled Ondrej Zary
2011-06-30 22:03 ` [PATCH 03/28] staging: ft1000-pcmcia: delete ft1000.conf Ondrej Zary
2011-06-30 22:03 ` [PATCH 04/28] staging: ft1000-pcmcia: get rid of ft1000_dev.h Ondrej Zary
2011-06-30 22:03 ` [PATCH 05/28] staging: ft1000-pcmcia: remove PSEUDO_HDR typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 06/28] staging: ft1000-pcmcia: remove DRVMSG typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 07/28] staging: ft1000-pcmcia: remove MEDIAMSG typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 08/28] staging: ft1000-pcmcia: delete unused TIMEMSG typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 09/28] staging: ft1000-pcmcia: remove DSPINITMSG typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 10/28] staging: ft1000-pcmcia: delete unused DSPHIBERNATE typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 11/28] staging: ft1000-pcmcia: delete unused APP_INFO_BLOCK typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 12/28] staging: ft1000-pcmcia: remove PROV_RECORD typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 13/28] staging: ft1000-pcmcia: remove FT1000_INFO typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 14/28] staging: ft1000-pcmcia: delete unused DPRAM_BLK typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 15/28] staging: ft1000-pcmcia: delete local_info_t typedef Ondrej Zary
2011-06-30 22:03 ` [PATCH 16/28] staging: ft1000-pcmcia: remove firmware download typedefs Ondrej Zary
2011-06-30 22:03 ` [PATCH 17/28] staging: ft1000-pcmcia: remove unused fields from struct ft1000_info Ondrej Zary
2011-06-30 22:03 ` [PATCH 18/28] staging: ft1000-pcmcia: remove custom defines for standard types Ondrej Zary
2011-06-30 22:03 ` [PATCH 19/28] staging: ft1000-pcmcia: remove useless defines from ft1000_cs.c Ondrej Zary
2011-06-30 22:03 ` [PATCH 20/28] staging: ft1000-pcmcia: remove useless debugging " Ondrej Zary
2011-06-30 22:03 ` [PATCH 21/28] staging: ft1000-pcmcia: remove misleading and template comments " Ondrej Zary
2011-06-30 22:03 ` [PATCH 22/28] staging: ft1000-pcmcia: remove unused ft1000_asic_read and ft1000_asic_write functions Ondrej Zary
2011-06-30 22:03 ` Ondrej Zary [this message]
2011-06-30 22:03 ` [PATCH 24/28] staging: ft1000-pcmcia: remove unused includes from ft1000_cs.c Ondrej Zary
2011-06-30 22:03 ` [PATCH 25/28] staging: ft1000-pcmcia: remove useless ft1000_release() function Ondrej Zary
2011-06-30 22:03 ` [PATCH 26/28] staging: ft1000-pcmcia: CodingStyle fixes in ft1000.h Ondrej Zary
2011-06-30 22:03 ` [PATCH 27/28] staging: ft1000-pcmcia: remove PSEUDOSZ, use sizeof(struct pseudo_hdr) instead Ondrej Zary
2011-06-30 22:03 ` [PATCH 28/28] staging: ft1000-pcmcia: remove support for v5 firmware Ondrej Zary
2011-07-05 17:35 ` [PATCH 00/28] staging: ft1000-pcmcia: various fixes Greg KH
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1309471437-12633-24-git-send-email-linux@rainbow-software.org \
--to=linux@rainbow-software.org \
--cc=greg@kroah.com \
--cc=linux-kernel@vger.kernel.org \
--cc=marek.belisko@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox