Dan Carpenter has pointed out that there are several sparse warnings
from et131x.c, listed below. This patch fixes all these errors.
drivers/staging/et131x/et131x.c:1870:33: warning: incorrect type in assignment
(different address spaces)
drivers/staging/et131x/et131x.c:1870:33: expected unsigned int [usertype]
*num_des
drivers/staging/et131x/et131x.c:1870:33: got unsigned int [noderef]
<asn:2>*<noident>
drivers/staging/et131x/et131x.c:1871:37: warning: incorrect type in assignment
(different address spaces)
drivers/staging/et131x/et131x.c:1871:37: expected unsigned int [usertype]
*full_offset
drivers/staging/et131x/et131x.c:1871:37: got unsigned int [noderef]
<asn:2>*<noident>
drivers/staging/et131x/et131x.c:1872:33: warning: incorrect type in assignment
(different address spaces)
drivers/staging/et131x/et131x.c:1872:33: expected unsigned int [usertype]
*min_des
drivers/staging/et131x/et131x.c:1872:33: got unsigned int [noderef]
<asn:2>*<noident>
drivers/staging/et131x/et131x.c:1873:33: warning: incorrect type in assignment
(different address spaces)
drivers/staging/et131x/et131x.c:1873:33: expected unsigned int [usertype]
*base_hi
drivers/staging/et131x/et131x.c:1873:33: got unsigned int [noderef]
<asn:2>*<noident>
drivers/staging/et131x/et131x.c:1874:33: warning: incorrect type in assignment
(different address spaces)
drivers/staging/et131x/et131x.c:1874:33: expected unsigned int [usertype]
*base_lo
drivers/staging/et131x/et131x.c:1874:33: got unsigned int [noderef]
<asn:2>*<noident>
drivers/staging/et131x/et131x.c:1876:33: warning: incorrect type in assignment
(different address spaces)
drivers/staging/et131x/et131x.c:1876:33: expected unsigned int [usertype]
*num_des
drivers/staging/et131x/et131x.c:1876:33: got unsigned int [noderef]
<asn:2>*<noident>
drivers/staging/et131x/et131x.c:1877:37: warning: incorrect type in assignment
(different address spaces)
drivers/staging/et131x/et131x.c:1877:37: expected unsigned int [usertype]
*full_offset
drivers/staging/et131x/et131x.c:1877:37: got unsigned int [noderef]
<asn:2>*<noident>
drivers/staging/et131x/et131x.c:1878:33: warning: incorrect type in assignment
(different address spaces)
drivers/staging/et131x/et131x.c:1878:33: expected unsigned int [usertype]
*min_des
drivers/staging/et131x/et131x.c:1878:33: got unsigned int [noderef]
<asn:2>*<noident>
drivers/staging/et131x/et131x.c:1879:33: warning: incorrect type in assignment
(different address spaces)
drivers/staging/et131x/et131x.c:1879:33: expected unsigned int [usertype]
*base_hi
drivers/staging/et131x/et131x.c:1879:33: got unsigned int [noderef]
<asn:2>*<noident>
drivers/staging/et131x/et131x.c:1880:33: warning: incorrect type in assignment
(different address spaces)
drivers/staging/et131x/et131x.c:1880:33: expected unsigned int [usertype]
*base_lo
drivers/staging/et131x/et131x.c:1880:33: got unsigned int [noderef]
<asn:2>*<noident>
drivers/staging/et131x/et131x.c:1898:24: warning: incorrect type in argument 2
(different address spaces)
drivers/staging/et131x/et131x.c:1898:24: expected void volatile [noderef]
<asn:2>*addr
drivers/staging/et131x/et131x.c:1898:24: got unsigned int [usertype] *base_hi
drivers/staging/et131x/et131x.c:1900:24: warning: incorrect type in argument 2
(different address spaces)
drivers/staging/et131x/et131x.c:1900:24: expected void volatile [noderef]
<asn:2>*addr
drivers/staging/et131x/et131x.c:1900:24: got unsigned int [usertype] *base_lo
drivers/staging/et131x/et131x.c:1901:60: warning: incorrect type in argument 2
(different address spaces)
drivers/staging/et131x/et131x.c:1901:60: expected void volatile [noderef]
<asn:2>*addr
drivers/staging/et131x/et131x.c:1901:60: got unsigned int [usertype] *num_des
drivers/staging/et131x/et131x.c:1902:39: warning: incorrect type in argument 2
(different address spaces)
drivers/staging/et131x/et131x.c:1902:39: expected void volatile [noderef]
<asn:2>*addr
drivers/staging/et131x/et131x.c:1902:39: got unsigned int [usertype]
*full_offset
drivers/staging/et131x/et131x.c:1910:24: warning: incorrect type in argument 2
(different address spaces)
drivers/staging/et131x/et131x.c:1910:24: expected void volatile [noderef]
<asn:2>*addr
drivers/staging/et131x/et131x.c:1910:24: got unsigned int [usertype] *min_des
drivers/staging/et131x/et131x.c:2583:32: warning: incorrect type in assignment
(different address spaces)
drivers/staging/et131x/et131x.c:2583:32: expected unsigned int [usertype]
*offset
drivers/staging/et131x/et131x.c:2583:32: got unsigned int [noderef]
<asn:2>*<noident>
drivers/staging/et131x/et131x.c:2585:32: warning: incorrect type in assignment
(different address spaces)
drivers/staging/et131x/et131x.c:2585:32: expected unsigned int [usertype]
*offset
drivers/staging/et131x/et131x.c:2585:32: got unsigned int [noderef]
<asn:2>*<noident>
drivers/staging/et131x/et131x.c:2602:24: warning: incorrect type in argument 2
(different address spaces)
drivers/staging/et131x/et131x.c:2602:24: expected void volatile [noderef]
<asn:2>*addr
drivers/staging/et131x/et131x.c:2602:24: got unsigned int [usertype] *offset
drivers/staging/et131x/et131x.c:4093:13: warning: symbol 'et131x_isr' was not
declared. Should it be static?
Signed-off-by: Mark Einon <mark.ei...@gmail.com>
---
drivers/staging/et131x/et131x.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/staging/et131x/et131x.c b/drivers/staging/et131x/et131x.c
index 82508fb..f0bc7ba 100644
--- a/drivers/staging/et131x/et131x.c
+++ b/drivers/staging/et131x/et131x.c
@@ -1860,11 +1860,11 @@ static void et131x_config_rx_dma_regs(struct
et131x_adapter *adapter)
rx_local->local_psr_full = 0;
for (id = 0; id < NUM_FBRS; id++) {
- u32 *num_des;
- u32 *full_offset;
- u32 *min_des;
- u32 *base_hi;
- u32 *base_lo;
+ u32 __iomem *num_des;
+ u32 __iomem *full_offset;
+ u32 __iomem *min_des;
+ u32 __iomem *base_hi;
+ u32 __iomem *base_lo;
if (id == 0) {
num_des = &rx_dma->fbr0_num_des;
@@ -2574,7 +2574,7 @@ static void nic_return_rfd(struct et131x_adapter
*adapter, struct rfd *rfd)
* need to clean up OOB data
*/
if (buff_index < rx_local->fbr[ring_index]->num_entries) {
- u32 *offset;
+ u32 __iomem *offset;
struct fbr_desc *next;
spin_lock_irqsave(&adapter->fbr_lock, flags);
@@ -4090,7 +4090,7 @@ static SIMPLE_DEV_PM_OPS(et131x_pm_ops, et131x_suspend,
et131x_resume);
*
* Returns a value indicating if the interrupt was handled.
*/
-irqreturn_t et131x_isr(int irq, void *dev_id)
+static irqreturn_t et131x_isr(int irq, void *dev_id)
{
bool handled = true;
struct net_device *netdev = (struct net_device *)dev_id;
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
