>From d20cec3758521de9c5c9c7a35c0a96a3671bc2c2 Mon Sep 17 00:00:00 2001 From: Francois Romieu Date: Sat, 3 May 2014 11:31:55 +0200 Subject: [PATCH 2/2] ec_bhf: line breaks and indent. Signed-off-by: Francois Romieu --- drivers/net/ethernet/ec_bhf.c | 33 +++++++++++++++------------------ 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/drivers/net/ethernet/ec_bhf.c b/drivers/net/ethernet/ec_bhf.c index e6e303c..46618b9 100644 --- a/drivers/net/ethernet/ec_bhf.c +++ b/drivers/net/ethernet/ec_bhf.c @@ -167,23 +167,23 @@ static void ec_bhf_print_status(struct ec_bhf_priv *priv) struct device *dev = PRIV_TO_DEV(priv); dev_dbg(dev, "Frame error counter: %d\n", - ioread8(priv->mac_io + MAC_FRAME_ERR_CNT)); + ioread8(priv->mac_io + MAC_FRAME_ERR_CNT)); dev_dbg(dev, "RX error counter: %d\n", - ioread8(priv->mac_io + MAC_RX_ERR_CNT)); + ioread8(priv->mac_io + MAC_RX_ERR_CNT)); dev_dbg(dev, "CRC error counter: %d\n", - ioread8(priv->mac_io + MAC_CRC_ERR_CNT)); + ioread8(priv->mac_io + MAC_CRC_ERR_CNT)); dev_dbg(dev, "TX frame counter: %d\n", - ioread32(priv->mac_io + MAC_TX_FRAME_CNT)); + ioread32(priv->mac_io + MAC_TX_FRAME_CNT)); dev_dbg(dev, "RX frame counter: %d\n", - ioread32(priv->mac_io + MAC_RX_FRAME_CNT)); + ioread32(priv->mac_io + MAC_RX_FRAME_CNT)); dev_dbg(dev, "TX fifo level: %d\n", - ioread8(priv->mac_io + MAC_TX_FIFO_LVL)); + ioread8(priv->mac_io + MAC_TX_FIFO_LVL)); dev_dbg(dev, "Dropped frames: %d\n", - ioread8(priv->mac_io + MAC_DROPPED_FRMS)); + ioread8(priv->mac_io + MAC_DROPPED_FRMS)); dev_dbg(dev, "Connected with CCAT slot: %d\n", - ioread8(priv->mac_io + MAC_CONNECTED_CCAT_FLAG)); + ioread8(priv->mac_io + MAC_CONNECTED_CCAT_FLAG)); dev_dbg(dev, "Link status: %d\n", - ioread8(priv->mii_io + MII_LINK_STATUS)); + ioread8(priv->mii_io + MII_LINK_STATUS)); } static void ec_bhf_reset(struct ec_bhf_priv *priv) @@ -277,9 +277,8 @@ static void ec_bhf_process_rx(struct ec_bhf_priv *priv) static enum hrtimer_restart ec_bhf_timer_fun(struct hrtimer *timer) { - struct ec_bhf_priv *priv = container_of(timer, - struct ec_bhf_priv, - hrtimer); + struct ec_bhf_priv *priv = container_of(timer, struct ec_bhf_priv, + hrtimer); ec_bhf_process_rx(priv); ec_bhf_process_tx(priv); @@ -401,8 +400,8 @@ static int ec_bhf_alloc_dma_mem(struct ec_bhf_priv *priv, dev_info(dev, "Allocating %d bytes for channel %d", (int)buf->alloc_len, channel); - buf->alloc = dma_alloc_coherent(dev, buf->alloc_len, - &buf->alloc_phys, GFP_KERNEL); + buf->alloc = dma_alloc_coherent(dev, buf->alloc_len, &buf->alloc_phys, + GFP_KERNEL); if (buf->alloc == NULL) { dev_info(dev, "Failed to allocate buffer\n"); return -ENOMEM; @@ -492,8 +491,7 @@ static int ec_bhf_open(struct net_device *net_dev) hrtimer_init(&priv->hrtimer, CLOCK_MONOTONIC, HRTIMER_MODE_REL); priv->hrtimer.function = ec_bhf_timer_fun; - hrtimer_start(&priv->hrtimer, - ktime_set(0, polling_frequency), + hrtimer_start(&priv->hrtimer, ktime_set(0, polling_frequency), HRTIMER_MODE_REL); dev_info(PRIV_TO_DEV(priv), "Device open\n"); @@ -590,8 +588,7 @@ static int ec_bhf_probe(struct pci_dev *dev, const struct pci_device_id *id) err = pci_request_regions(dev, "ec_bhf"); if (err) { - dev_err(&dev->dev, - "Failed to request pci memory regions\n"); + dev_err(&dev->dev, "Failed to request pci memory regions\n"); goto err_disable_dev; } -- 1.7.10.4