Skip to content

Commit

Permalink
driver/net/ethernet/ec_bhf.c: fix sparse warnings
Browse files Browse the repository at this point in the history
Sparse was reporting quite a few warnings for the driver.
Those get fixed by this patch.

Signed-off-by: Dariusz Marcinkiewicz <reksio@newterm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Darek Marcinkiewicz authored and David S. Miller committed May 14, 2014
1 parent c722831 commit eb02a27
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions drivers/net/ethernet/ec_bhf.c
Original file line number Diff line number Diff line change
Expand Up @@ -134,17 +134,17 @@ struct ec_bhf_priv {

struct pci_dev *dev;

void * __iomem io;
void * __iomem dma_io;
void __iomem *io;
void __iomem *dma_io;

struct hrtimer hrtimer;

int tx_dma_chan;
int rx_dma_chan;
void * __iomem ec_io;
void * __iomem fifo_io;
void * __iomem mii_io;
void * __iomem mac_io;
void __iomem *ec_io;
void __iomem *fifo_io;
void __iomem *mii_io;
void __iomem *mac_io;

struct bhf_dma rx_buf;
struct rx_desc *rx_descs;
Expand Down Expand Up @@ -297,7 +297,7 @@ static int ec_bhf_setup_offsets(struct ec_bhf_priv *priv)
{
struct device *dev = PRIV_TO_DEV(priv);
unsigned block_count, i;
void * __iomem ec_info;
void __iomem *ec_info;

dev_dbg(dev, "Info block:\n");
dev_dbg(dev, "Type of function: %x\n", (unsigned)ioread16(priv->io));
Expand Down Expand Up @@ -569,8 +569,8 @@ static int ec_bhf_probe(struct pci_dev *dev, const struct pci_device_id *id)
{
struct net_device *net_dev;
struct ec_bhf_priv *priv;
void * __iomem dma_io;
void * __iomem io;
void __iomem *dma_io;
void __iomem *io;
int err = 0;

err = pci_enable_device(dev);
Expand Down Expand Up @@ -615,7 +615,7 @@ static int ec_bhf_probe(struct pci_dev *dev, const struct pci_device_id *id)
}

net_dev = alloc_etherdev(sizeof(struct ec_bhf_priv));
if (net_dev == 0) {
if (net_dev == NULL) {
err = -ENOMEM;
goto err_unmap_dma_io;
}
Expand Down

0 comments on commit eb02a27

Please sign in to comment.