summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorviro@ftp.linux.org.uk <viro@ftp.linux.org.uk>2005-09-05 03:25:48 +0100
committerJeff Garzik <jgarzik@pobox.com>2005-09-05 17:57:22 -0400
commit91fb4c964c606e63ce0d0d31814728d62a5de9bc (patch)
tree11f7b7eaa9575555666e8c8f96d5bb28a0e1ae8d
parent67d2c36e901403bb97cb79ddb44d702c3284d0ba (diff)
downloadop-kernel-dev-91fb4c964c606e63ce0d0d31814728d62a5de9bc.zip
op-kernel-dev-91fb4c964c606e63ce0d0d31814728d62a5de9bc.tar.gz
[PATCH] (1/7) chelsio sparse annotations
NULL noise removal, __iomem annotations, use of if_mii() instead of open-coding it. Signed-off-by: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
-rw-r--r--drivers/net/chelsio/common.h4
-rw-r--r--drivers/net/chelsio/cxgb2.c2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/chelsio/common.h b/drivers/net/chelsio/common.h
index f093488..bf3e7b6 100644
--- a/drivers/net/chelsio/common.h
+++ b/drivers/net/chelsio/common.h
@@ -88,7 +88,7 @@ struct t1_rx_mode {
static inline u8 *t1_get_next_mcaddr(struct t1_rx_mode *rm)
{
- u8 *addr = 0;
+ u8 *addr = NULL;
if (rm->idx++ < rm->dev->mc_count) {
addr = rm->list->dmi_addr;
@@ -190,7 +190,7 @@ struct sge;
struct peespi;
struct adapter {
- u8 *regs;
+ u8 __iomem *regs;
struct pci_dev *pdev;
unsigned long registered_device_map;
unsigned long open_device_map;
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c
index 28ae478..349ebe7 100644
--- a/drivers/net/chelsio/cxgb2.c
+++ b/drivers/net/chelsio/cxgb2.c
@@ -824,7 +824,7 @@ static void cxgb_proc_cleanup(struct adapter *adapter,
static int t1_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
{
struct adapter *adapter = dev->priv;
- struct mii_ioctl_data *data = (struct mii_ioctl_data *)&req->ifr_data;
+ struct mii_ioctl_data *data = if_mii(req);
switch (cmd) {
case SIOCGMIIPHY:
OpenPOWER on IntegriCloud