From: Stephen Hemminger <shemminger@vyatta•com>
To: Rasesh Mody <rmody@brocade•com>
Cc: netdev@vger•kernel.org
Subject: [PATCH 2/2] bna: fix sparse warnings/errors
Date: Wed, 04 Jan 2012 15:02:24 -0800 [thread overview]
Message-ID: <20120104230239.111580138@vyatta.com> (raw)
In-Reply-To: 20120104230222.355802239@vyatta.com
[-- Attachment #1: bna-sparse.patch --]
[-- Type: text/plain, Size: 2579 bytes --]
This fixes a several sparse warnings.
* the __iomem tag was being used incorrectly (needs to be a prefix)
* several variables should have been static since local to one file
* the firmware was not being forwared declared
and was const one place and not the other
Signed-off-by: Stephen Hemminger <shemminger@vyatta•com>
---
drivers/net/ethernet/brocade/bna/bna_types.h | 6 +++---
drivers/net/ethernet/brocade/bna/bnad.c | 6 +++---
drivers/net/ethernet/brocade/bna/bnad.h | 2 +-
drivers/net/ethernet/brocade/bna/cna_fwimg.c | 1 +
4 files changed, 8 insertions(+), 7 deletions(-)
--- a/drivers/net/ethernet/brocade/bna/bnad.c 2011-12-23 21:06:15.720436866 -0800
+++ b/drivers/net/ethernet/brocade/bna/bnad.c 2012-01-04 14:25:57.474471816 -0800
@@ -53,9 +53,9 @@ MODULE_PARM_DESC(bna_debugfs_enable, "En
* Global variables
*/
u32 bnad_rxqs_per_cq = 2;
-u32 bna_id;
-struct mutex bnad_list_mutex;
-LIST_HEAD(bnad_list);
+static u32 bna_id;
+static struct mutex bnad_list_mutex;
+static LIST_HEAD(bnad_list);
static const u8 bnad_bcast_addr[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
/*
--- a/drivers/net/ethernet/brocade/bna/bna_types.h 2011-12-23 21:06:15.720436866 -0800
+++ b/drivers/net/ethernet/brocade/bna/bna_types.h 2012-01-04 14:46:00.232255609 -0800
@@ -427,7 +427,7 @@ struct bna_ethport {
/* Doorbell structure */
struct bna_ib_dbell {
- void *__iomem doorbell_addr;
+ void __iomem *doorbell_addr;
u32 doorbell_ack;
};
@@ -463,7 +463,7 @@ struct bna_tcb {
u32 consumer_index;
volatile u32 *hw_consumer_index;
u32 q_depth;
- void *__iomem q_dbell;
+ void __iomem *q_dbell;
struct bna_ib_dbell *i_dbell;
int page_idx;
int page_count;
@@ -599,7 +599,7 @@ struct bna_rcb {
u32 producer_index;
u32 consumer_index;
u32 q_depth;
- void *__iomem q_dbell;
+ void __iomem *q_dbell;
int page_idx;
int page_count;
/* Control path */
--- a/drivers/net/ethernet/brocade/bna/bnad.h 2011-12-23 21:06:15.724436897 -0800
+++ b/drivers/net/ethernet/brocade/bna/bnad.h 2012-01-04 14:37:34.562824877 -0800
@@ -347,7 +347,7 @@ struct bnad_drvinfo {
/*
* EXTERN VARIABLES
*/
-extern struct firmware *bfi_fw;
+extern const struct firmware *bfi_fw;
extern u32 bnad_rxqs_per_cq;
/*
--- a/drivers/net/ethernet/brocade/bna/cna_fwimg.c 2011-12-07 10:54:18.724278422 -0800
+++ b/drivers/net/ethernet/brocade/bna/cna_fwimg.c 2012-01-04 14:30:33.165920654 -0800
@@ -16,6 +16,7 @@
* www.brocade.com
*/
#include <linux/firmware.h>
+#include "bnad.h"
#include "bfi.h"
#include "cna.h"
next prev parent reply other threads:[~2012-01-04 23:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20120104230222.355802239@vyatta.com>
2012-01-04 23:02 ` [PATCH 1/2] bna: make ethtool_ops and strings const Stephen Hemminger
2012-01-05 18:23 ` David Miller
2012-01-05 18:28 ` Rasesh Mody
2012-01-04 23:02 ` Stephen Hemminger [this message]
2012-01-05 18:23 ` [PATCH 2/2] bna: fix sparse warnings/errors David Miller
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=20120104230239.111580138@vyatta.com \
--to=shemminger@vyatta$(echo .)com \
--cc=netdev@vger$(echo .)kernel.org \
--cc=rmody@brocade$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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