aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorviro@ftp.linux.org.uk <viro@ftp.linux.org.uk>2005-09-04 22:25:48 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-09-05 17:57:22 -0400
commit91fb4c964c606e63ce0d0d31814728d62a5de9bc (patch)
tree11f7b7eaa9575555666e8c8f96d5bb28a0e1ae8d
parent67d2c36e901403bb97cb79ddb44d702c3284d0ba (diff)
[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 f09348802b46..bf3e7b6a7a18 100644
--- a/drivers/net/chelsio/common.h
+++ b/drivers/net/chelsio/common.h
@@ -88,7 +88,7 @@ struct t1_rx_mode {
88 88
89static inline u8 *t1_get_next_mcaddr(struct t1_rx_mode *rm) 89static inline u8 *t1_get_next_mcaddr(struct t1_rx_mode *rm)
90{ 90{
91 u8 *addr = 0; 91 u8 *addr = NULL;
92 92
93 if (rm->idx++ < rm->dev->mc_count) { 93 if (rm->idx++ < rm->dev->mc_count) {
94 addr = rm->list->dmi_addr; 94 addr = rm->list->dmi_addr;
@@ -190,7 +190,7 @@ struct sge;
190struct peespi; 190struct peespi;
191 191
192struct adapter { 192struct adapter {
193 u8 *regs; 193 u8 __iomem *regs;
194 struct pci_dev *pdev; 194 struct pci_dev *pdev;
195 unsigned long registered_device_map; 195 unsigned long registered_device_map;
196 unsigned long open_device_map; 196 unsigned long open_device_map;
diff --git a/drivers/net/chelsio/cxgb2.c b/drivers/net/chelsio/cxgb2.c
index 28ae478b386d..349ebe783ed6 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,
824static int t1_ioctl(struct net_device *dev, struct ifreq *req, int cmd) 824static int t1_ioctl(struct net_device *dev, struct ifreq *req, int cmd)
825{ 825{
826 struct adapter *adapter = dev->priv; 826 struct adapter *adapter = dev->priv;
827 struct mii_ioctl_data *data = (struct mii_ioctl_data *)&req->ifr_data; 827 struct mii_ioctl_data *data = if_mii(req);
828 828
829 switch (cmd) { 829 switch (cmd) {
830 case SIOCGMIIPHY: 830 case SIOCGMIIPHY: