{"id":814677,"url":"http://patchwork.ozlabs.org/api/patches/814677/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20170917172502.32531-1-roman@advem.lv/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170917172502.32531-1-roman@advem.lv>","list_archive_url":null,"date":"2017-09-17T17:25:02","name":"[net-next,v2,5/7] net: korina: whitespace cleanup","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"6eb4152bdcadf70b562bf0fbe4db5cd2fb012d47","submitter":{"id":65345,"url":"http://patchwork.ozlabs.org/api/people/65345/?format=json","name":"Roman Yeryomin","email":"leroi.lists@gmail.com"},"delegate":{"id":34,"url":"http://patchwork.ozlabs.org/api/users/34/?format=json","username":"davem","first_name":"David","last_name":"Miller","email":"davem@davemloft.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20170917172502.32531-1-roman@advem.lv/mbox/","series":[{"id":3532,"url":"http://patchwork.ozlabs.org/api/series/3532/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=3532","date":"2017-09-17T17:23:53","name":"korina: performance fixes and cleanup","version":2,"mbox":"http://patchwork.ozlabs.org/series/3532/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/814677/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/814677/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming@ozlabs.org","Delivered-To":"patchwork-incoming@ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=vger.kernel.org\n\t(client-ip=209.132.180.67; helo=vger.kernel.org;\n\tenvelope-from=netdev-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org; dkim=pass (2048-bit key;\n\tunprotected) header.d=gmail.com header.i=@gmail.com\n\theader.b=\"QPp+mz1g\"; dkim-atps=neutral"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 3xwGH63Rvmz9s83\n\tfor ;\n\tMon, 18 Sep 2017 03:25:06 +1000 (AEST)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1751830AbdIQRZE (ORCPT );\n\tSun, 17 Sep 2017 13:25:04 -0400","from mail-lf0-f67.google.com ([209.85.215.67]:36444 \"EHLO\n\tmail-lf0-f67.google.com\" rhost-flags-OK-OK-OK-OK) by vger.kernel.org\n\twith ESMTP id S1751686AbdIQRZD (ORCPT\n\t); Sun, 17 Sep 2017 13:25:03 -0400","by mail-lf0-f67.google.com with SMTP id l196so3439829lfl.3\n\tfor ; Sun, 17 Sep 2017 10:25:02 -0700 (PDT)","from ubrain.corp.ubnt.com\n\t([2a02:16d8:105:4000:76d4:35ff:fe88:7631])\n\tby smtp.googlemail.com with ESMTPSA id\n\tr2sm1410517lja.32.2017.09.17.10.25.00 for \n\t(version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128);\n\tSun, 17 Sep 2017 10:25:01 -0700 (PDT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=gmail.com; s=20161025; h=from:to:subject:date:message-id;\n\tbh=WCbCaxdKKCgelyfy1TbVoE25GDW5tEEumYaFVljZv9g=;\n\tb=QPp+mz1gQefPrwqdIuujeQXHxpwf4zqMwoFArpe635bwpyoDwsHdyshlL485eVoG56\n\tyQFY3tc9/tp2O8vGA2/8kDe66E9ylRV2YAc/D4DfxZx7qYXOZZvXpHkJK3sgugDVrlHK\n\tQcRWbWeQuz4d47tHQlLWpkB7TysirHpu51cPhyr/ezXj226m62HD1jbKuFx7m8ezc6Md\n\tXuv9ItUi32R6QAj0mXyjoC8RJaClBJSj/mrwxi0607fk9MovyJqdrWaP/lzLaAFzQYqx\n\t4LDBadoOA841RvayEwsWguIcotvQ2y3vEsUtLdisVm7tuJJ+W7Kc657GCmhX2316LC/k\n\t8uIg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n\td=1e100.net; s=20161025;\n\th=x-gm-message-state:from:to:subject:date:message-id;\n\tbh=WCbCaxdKKCgelyfy1TbVoE25GDW5tEEumYaFVljZv9g=;\n\tb=Bi99f6hWSTlPvFBuvkl3i9BekyvEH6EkNaCvAqDavQDns4HU1GmeXGGioV8+hnz9P4\n\tonvT0wQQrfuZBMhda5LokOaE0A5cpeAOVGWR+ji3HALgCoCvFOrLAjpih9zX1eb3yxu+\n\tTo5Q2yHtBLJjAwLidn8WGcGRrzoyrBFjOjvnc4zW4UZZkuozGld6DoeR8ghfksr6FiE6\n\tjo+PSbsKwnVpv19BPBV32KuRbzUjG0yHEL9um8d2A7uzrJTMAu/dDZB0FvkkCmZ3Po25\n\tcwAJYIquXPXz8rtYsjdj19BQnNXqCgawqGcuqyqXyhVebfPfJ0n81wbgImoQwTAhurbp\n\tNMrg==","X-Gm-Message-State":"AHPjjUghwmSE6LAd1uCj4Kk65NEs3UfCtfNFNHmkZpYw9DU6QE6Hdggv\n\tGukdmhrTI6EagZjA","X-Google-Smtp-Source":"AOwi7QBiTFBCJLeIvibsD8uCkYeleiIZj/om9wb0RJLM9M5pmYM25u+7ZD+D2W1pXI/cwVdmb99fRA==","X-Received":"by 10.25.42.144 with SMTP id q16mr2600843lfq.134.1505669101804; \n\tSun, 17 Sep 2017 10:25:01 -0700 (PDT)","From":"Roman Yeryomin ","X-Google-Original-From":"Roman Yeryomin ","To":"netdev ","Subject":"[PATCH net-next v2 5/7] net: korina: whitespace cleanup","Date":"Sun, 17 Sep 2017 20:25:02 +0300","Message-Id":"<20170917172502.32531-1-roman@advem.lv>","X-Mailer":"git-send-email 2.11.0","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"Signed-off-by: Roman Yeryomin \n---\n drivers/net/ethernet/korina.c | 58 +++++++++++++++++++++++--------------------\n 1 file changed, 31 insertions(+), 27 deletions(-)","diff":"diff --git a/drivers/net/ethernet/korina.c b/drivers/net/ethernet/korina.c\nindex 5f36e1703378..c26f0d84ba6b 100644\n--- a/drivers/net/ethernet/korina.c\n+++ b/drivers/net/ethernet/korina.c\n@@ -64,9 +64,9 @@\n #include \n #include \n \n-#define DRV_NAME \"korina\"\n-#define DRV_VERSION \"0.10\"\n-#define DRV_RELDATE \"04Mar2008\"\n+#define DRV_NAME\t\"korina\"\n+#define DRV_VERSION\t\"0.10\"\n+#define DRV_RELDATE\t\"04Mar2008\"\n \n #define STATION_ADDRESS_HIGH(dev) (((dev)->dev_addr[0] << 8) | \\\n \t\t\t\t ((dev)->dev_addr[1]))\n@@ -75,7 +75,7 @@\n \t\t\t\t ((dev)->dev_addr[4] << 8) | \\\n \t\t\t\t ((dev)->dev_addr[5]))\n \n-#define MII_CLOCK 1250000 \t/* no more than 2.5MHz */\n+#define MII_CLOCK\t1250000 /* no more than 2.5MHz */\n \n /* the following must be powers of two */\n #define KORINA_NUM_RDS\t64 /* number of receive descriptors */\n@@ -87,15 +87,19 @@\n #define KORINA_RBSIZE\t1536 /* size of one resource buffer = Ether MTU */\n #define KORINA_RDS_MASK\t(KORINA_NUM_RDS - 1)\n #define KORINA_TDS_MASK\t(KORINA_NUM_TDS - 1)\n-#define RD_RING_SIZE \t(KORINA_NUM_RDS * sizeof(struct dma_desc))\n+#define RD_RING_SIZE\t(KORINA_NUM_RDS * sizeof(struct dma_desc))\n #define TD_RING_SIZE\t(KORINA_NUM_TDS * sizeof(struct dma_desc))\n \n-#define TX_TIMEOUT \t(6000 * HZ / 1000)\n+#define TX_TIMEOUT\t(6000 * HZ / 1000)\n \n-enum chain_status { desc_filled, desc_empty };\n-#define IS_DMA_FINISHED(X) (((X) & (DMA_DESC_FINI)) != 0)\n-#define IS_DMA_DONE(X) (((X) & (DMA_DESC_DONE)) != 0)\n-#define RCVPKT_LENGTH(X) (((X) & ETH_RX_LEN) >> ETH_RX_LEN_BIT)\n+enum chain_status {\n+\tdesc_filled,\n+\tdesc_empty\n+};\n+\n+#define IS_DMA_FINISHED(X)\t(((X) & (DMA_DESC_FINI)) != 0)\n+#define IS_DMA_DONE(X)\t\t(((X) & (DMA_DESC_DONE)) != 0)\n+#define RCVPKT_LENGTH(X)\t(((X) & ETH_RX_LEN) >> ETH_RX_LEN_BIT)\n \n /* Information that need to be kept for each board. */\n struct korina_private {\n@@ -123,7 +127,7 @@ struct korina_private {\n \tint rx_irq;\n \tint tx_irq;\n \n-\tspinlock_t lock; /* NIC xmit lock */\n+\tspinlock_t lock;\t/* NIC xmit lock */\n \n \tint dma_halt_cnt;\n \tint dma_run_cnt;\n@@ -146,17 +150,17 @@ static inline void korina_start_dma(struct dma_reg *ch, u32 dma_addr)\n static inline void korina_abort_dma(struct net_device *dev,\n \t\t\t\t\tstruct dma_reg *ch)\n {\n- if (readl(&ch->dmac) & DMA_CHAN_RUN_BIT) {\n-\t writel(0x10, &ch->dmac);\n+\tif (readl(&ch->dmac) & DMA_CHAN_RUN_BIT) {\n+\t\twritel(0x10, &ch->dmac);\n \n-\t while (!(readl(&ch->dmas) & DMA_STAT_HALT))\n-\t\t netif_trans_update(dev);\n+\t\twhile (!(readl(&ch->dmas) & DMA_STAT_HALT))\n+\t\t\tnetif_trans_update(dev);\n \n-\t writel(0, &ch->dmas);\n- }\n+\t\twritel(0, &ch->dmas);\n+\t}\n \n- writel(0, &ch->dmadptr);\n- writel(0, &ch->dmandptr);\n+\twritel(0, &ch->dmadptr);\n+\twritel(0, &ch->dmandptr);\n }\n \n static inline void korina_chain_dma(struct dma_reg *ch, u32 dma_addr)\n@@ -685,7 +689,7 @@ static int korina_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)\n \n /* ethtool helpers */\n static void netdev_get_drvinfo(struct net_device *dev,\n-\t\t\tstruct ethtool_drvinfo *info)\n+\t\t\t\tstruct ethtool_drvinfo *info)\n {\n \tstruct korina_private *lp = netdev_priv(dev);\n \n@@ -728,10 +732,10 @@ static u32 netdev_get_link(struct net_device *dev)\n }\n \n static const struct ethtool_ops netdev_ethtool_ops = {\n-\t.get_drvinfo = netdev_get_drvinfo,\n-\t.get_link = netdev_get_link,\n-\t.get_link_ksettings = netdev_get_link_ksettings,\n-\t.set_link_ksettings = netdev_set_link_ksettings,\n+\t.get_drvinfo\t\t= netdev_get_drvinfo,\n+\t.get_link\t\t= netdev_get_link,\n+\t.get_link_ksettings\t= netdev_get_link_ksettings,\n+\t.set_link_ksettings\t= netdev_set_link_ksettings,\n };\n \n static int korina_alloc_ring(struct net_device *dev)\n@@ -863,7 +867,7 @@ static int korina_init(struct net_device *dev)\n \t/* Management Clock Prescaler Divisor\n \t * Clock independent setting */\n \twritel(((idt_cpu_freq) / MII_CLOCK + 1) & ~1,\n-\t\t &lp->eth_regs->ethmcp);\n+\t\t\t&lp->eth_regs->ethmcp);\n \n \t/* don't transmit until fifo contains 48b */\n \twritel(48, &lp->eth_regs->ethfifott);\n@@ -946,14 +950,14 @@ static int korina_open(struct net_device *dev)\n \t\t\t0, \"Korina ethernet Rx\", dev);\n \tif (ret < 0) {\n \t\tprintk(KERN_ERR \"%s: unable to get Rx DMA IRQ %d\\n\",\n-\t\t dev->name, lp->rx_irq);\n+\t\t\tdev->name, lp->rx_irq);\n \t\tgoto err_release;\n \t}\n \tret = request_irq(lp->tx_irq, korina_tx_dma_interrupt,\n \t\t\t0, \"Korina ethernet Tx\", dev);\n \tif (ret < 0) {\n \t\tprintk(KERN_ERR \"%s: unable to get Tx DMA IRQ %d\\n\",\n-\t\t dev->name, lp->tx_irq);\n+\t\t\tdev->name, lp->tx_irq);\n \t\tgoto err_free_rx_irq;\n \t}\n \n","prefixes":["net-next","v2","5/7"]}