>From d2a5bfdc7854e9b3cffcab9249299354fa5037d0 Mon Sep 17 00:00:00 2001 Message-Id: From: Francois Romieu Date: Sat, 3 May 2014 11:15:26 +0200 Subject: [PATCH 1/4] ec_bhf: inverted xmas tree. X-Organisation: Land of Sunshine Inc. Signed-off-by: Francois Romieu --- drivers/net/ethernet/ec_bhf.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/net/ethernet/ec_bhf.c b/drivers/net/ethernet/ec_bhf.c index 8e78b8d..9e1636b 100644 --- a/drivers/net/ethernet/ec_bhf.c +++ b/drivers/net/ethernet/ec_bhf.c @@ -205,8 +205,8 @@ static void ec_bhf_reset(struct ec_bhf_priv *priv) static void ec_bhf_send_packet(struct ec_bhf_priv *priv, struct tx_desc *desc) { - u32 addr = (u8 *)desc - priv->tx_buf.buf; u32 len = le16_to_cpu(desc->header.len) + sizeof(desc->header); + u32 addr = (u8 *)desc - priv->tx_buf.buf; iowrite32((ALIGN(len, 8) << 24) | addr, priv->fifo_io + FIFO_TX_REG); @@ -598,11 +598,11 @@ static const struct net_device_ops ec_bhf_netdev_ops = { static int ec_bhf_probe(struct pci_dev *dev, const struct pci_device_id *id) { - int err = 0; - void * __iomem io; - void * __iomem dma_io; struct net_device *net_dev; struct ec_bhf_priv *priv; + void * __iomem dma_io; + void * __iomem io; + int err = 0; err = pci_enable_device(dev); if (err) -- 1.9.0