From: Mark Einon <mark.einon@gmail.com>
To: gregkh@suse.de
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org,
o.hartmann@telovital.com, alan@lxorguk.ukuu.org.uk,
Mark Einon <Mark.Einon@gmail.com>,
Mark Einon <mark.einon@gmail.com>
Subject: [PATCH v2 4/7] staging: et131x: et131x_initpci.c checkpatch fixes
Date: Mon, 6 Jun 2011 19:07:01 +0100 [thread overview]
Message-ID: <1307383624-8740-5-git-send-email-mark.einon@gmail.com> (raw)
In-Reply-To: <1307383624-8740-1-git-send-email-mark.einon@gmail.com>
From: Mark Einon <Mark.Einon@gmail.com>
Signed-off-by: Mark Einon <mark.einon@gmail.com>
---
drivers/staging/et131x/et131x_initpci.c | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/drivers/staging/et131x/et131x_initpci.c b/drivers/staging/et131x/et131x_initpci.c
index 50237ac..1dd2e5e 100644
--- a/drivers/staging/et131x/et131x_initpci.c
+++ b/drivers/staging/et131x/et131x_initpci.c
@@ -113,13 +113,13 @@
static u32 et131x_speed_set;
module_param(et131x_speed_set, uint, 0);
MODULE_PARM_DESC(et131x_speed_set,
- "Set Link speed and dublex manually (0-5) [0]\n \
- 1 : 10Mb Half-Duplex\n \
- 2 : 10Mb Full-Duplex\n \
- 3 : 100Mb Half-Duplex\n \
- 4 : 100Mb Full-Duplex\n \
- 5 : 1000Mb Full-Duplex\n \
- 0 : Auto Speed Auto Dublex");
+ "Set Link speed and dublex manually (0-5) [0]\n"
+ "1 : 10Mb Half-Duplex\n"
+ "2 : 10Mb Full-Duplex\n"
+ "3 : 100Mb Half-Duplex\n"
+ "4 : 100Mb Full-Duplex\n"
+ "5 : 1000Mb Full-Duplex\n"
+ "0 : Auto Speed Auto Dublex");
/**
* et131x_hwaddr_init - set up the MAC Address on the ET1310
@@ -539,7 +539,8 @@ static struct et131x_adapter *et131x_adapter_init(struct net_device *netdev,
struct et131x_adapter *etdev;
- /* Setup the fundamental net_device and private adapter structure elements */
+ /* Setup the fundamental net_device and private adapter structure
+ * elements */
SET_NETDEV_DEV(netdev, &pdev->dev);
/* Allocate private adapter struct and copy in relevant information */
@@ -807,12 +808,12 @@ static struct pci_device_id et131x_pci_table[] __devinitdata = {
MODULE_DEVICE_TABLE(pci, et131x_pci_table);
static struct pci_driver et131x_driver = {
- .name = DRIVER_NAME,
- .id_table = et131x_pci_table,
- .probe = et131x_pci_setup,
- .remove = __devexit_p(et131x_pci_remove),
- .suspend = NULL, /* et131x_pci_suspend */
- .resume = NULL, /* et131x_pci_resume */
+ .name = DRIVER_NAME,
+ .id_table = et131x_pci_table,
+ .probe = et131x_pci_setup,
+ .remove = __devexit_p(et131x_pci_remove),
+ .suspend = NULL, /* et131x_pci_suspend */
+ .resume = NULL, /* et131x_pci_resume */
};
--
1.7.4.4
next prev parent reply other threads:[~2011-06-06 18:07 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-05 17:35 [PATCH 0/5] staging: et131x: checkpatch fixes Mark Einon
2011-06-05 17:35 ` [PATCH 1/5] staging: et131x: et1310_address_map.h " Mark Einon
2011-06-05 19:14 ` Alan Cox
2011-06-05 17:35 ` [PATCH 2/5] staging: et131x: et1310_rx.c " Mark Einon
2011-06-05 19:08 ` Alan Cox
2011-06-05 17:35 ` [PATCH 3/5] staging: et131x: et131x_adapter.h " Mark Einon
2011-06-05 19:11 ` Alan Cox
2011-06-05 17:35 ` [PATCH 4/5] staging: et131x: et131x_initpci.c " Mark Einon
2011-06-05 19:09 ` Alan Cox
2011-06-06 6:00 ` Dan Carpenter
2011-06-05 17:35 ` [PATCH 5/5] staging: et131x: et131x_netdev.c " Mark Einon
2011-06-05 19:10 ` Alan Cox
2011-06-05 19:11 ` [PATCH 0/5] staging: et131x: " Alan Cox
2011-06-06 18:06 ` [PATCH v2 0/7] " Mark Einon
2011-06-06 18:06 ` [PATCH v2 1/7] staging: et131x: checkpatch fixes for et1310_address_map.h (All 'do not add new typedefs') Mark Einon
2011-06-06 18:06 ` [PATCH v2 2/7] staging: et131x: et1310_rx.c checkpatch fixes Mark Einon
2011-06-06 18:07 ` [PATCH v2 3/7] staging: et131x: et131x_adapter.h " Mark Einon
2011-06-06 18:07 ` Mark Einon [this message]
2011-06-06 18:07 ` [PATCH v2 5/7] staging: et131x: et131x_netdev.c " Mark Einon
2011-06-06 18:07 ` [PATCH v2 6/7] staging: et131x: Fixes multiple 'WARNING: do not add new typedefs' Mark Einon
2011-06-06 18:07 ` [PATCH v2 7/7] staging: et131x: Removing '_t' from ce_stats_t struct Mark Einon
2011-06-06 18:31 ` Joe Perches
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=1307383624-8740-5-git-send-email-mark.einon@gmail.com \
--to=mark.einon@gmail.com \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=o.hartmann@telovital.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