From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mgw.gov.kz (mgw.gov.kz [89.218.88.242]) by dpdk.org (Postfix) with ESMTP id 0D6EE68CD for ; Mon, 21 Jul 2014 14:03:00 +0200 (CEST) Received: from mgw.gov.kz (mx.ctsat.kz [178.89.4.95]) by mgw.gov.kz with ESMTP id s6LC4C6x031806-s6LC4C70031806; Mon, 21 Jul 2014 18:04:12 +0600 Received: from EXCASHUB1.rgp.local (192.168.40.51) by EdgeForefront.rgp.local (192.168.40.59) with Microsoft SMTP Server (TLS) id 14.2.247.3; Mon, 21 Jul 2014 18:03:49 +0600 Received: from deb-dpdk.rgp.local (192.168.35.15) by excashub1.rgp.local (192.168.40.48) with Microsoft SMTP Server (TLS) id 14.2.247.3; Mon, 21 Jul 2014 18:07:05 +0600 From: Yerden Zhumabekov To: Date: Mon, 21 Jul 2014 18:03:52 +0600 Message-ID: <1405944234-50272-2-git-send-email-e_zhumabekov@sts.kz> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1405944234-50272-1-git-send-email-e_zhumabekov@sts.kz> References: <2795655.Wj4j2zIbVg@xps13> <1405944234-50272-1-git-send-email-e_zhumabekov@sts.kz> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.35.15] X-FEAS-SYSTEM-WL: e_zhumabekov@sts.kz Subject: [dpdk-dev] [igb_uio PATCH 1/3] igb_uio: fixed typos X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jul 2014 12:03:01 -0000 Signed-off-by: Yerden Zhumabekov --- lib/librte_eal/linuxapp/igb_uio/igb_uio.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c index 05cbe8e..02545d9 100644 --- a/lib/librte_eal/linuxapp/igb_uio/igb_uio.c +++ b/lib/librte_eal/linuxapp/igb_uio/igb_uio.c @@ -227,25 +227,27 @@ static const struct attribute_group dev_attr_grp = { /* Check if INTX works to control irq's. * Set's INTX_DISABLE flag and reads it back */ -static bool pci_intx_mask_supported(struct pci_dev *dev) +static bool pci_intx_mask_supported(struct pci_dev *pdev) { bool mask_supported = false; - uint16_t orig, new + uint16_t orig, new; - pci_block_user_cfg_access(dev); + pci_block_user_cfg_access(pdev); pci_read_config_word(pdev, PCI_COMMAND, &orig); - pci_write_config_word(dev, PCI_COMMAND, + pci_write_config_word(pdev, PCI_COMMAND, orig ^ PCI_COMMAND_INTX_DISABLE); - pci_read_config_word(dev, PCI_COMMAND, &new); + pci_read_config_word(pdev, PCI_COMMAND, &new); if ((new ^ orig) & ~PCI_COMMAND_INTX_DISABLE) { - dev_err(&dev->dev, "Command register changed from " + dev_err(&pdev->dev, "Command register changed from " "0x%x to 0x%x: driver or hardware bug?\n", orig, new); } else if ((new ^ orig) & PCI_COMMAND_INTX_DISABLE) { mask_supported = true; - pci_write_config_word(dev, PCI_COMMAND, orig); + pci_write_config_word(pdev, PCI_COMMAND, orig); } - pci_unblock_user_cfg_access(dev); + pci_unblock_user_cfg_access(pdev); + + return mask_supported; } static bool pci_check_and_mask_intx(struct pci_dev *pdev) @@ -253,7 +255,7 @@ static bool pci_check_and_mask_intx(struct pci_dev *pdev) bool pending; uint32_t status; - pci_block_user_cfg_access(dev); + pci_block_user_cfg_access(pdev); pci_read_config_dword(pdev, PCI_COMMAND, &status); /* interrupt is not ours, goes to out */ @@ -262,7 +264,7 @@ static bool pci_check_and_mask_intx(struct pci_dev *pdev) uint16_t old, new; old = status; - if (state != 0) + if (status != 0) new = old & (~PCI_COMMAND_INTX_DISABLE); else new = old | PCI_COMMAND_INTX_DISABLE; @@ -270,7 +272,7 @@ static bool pci_check_and_mask_intx(struct pci_dev *pdev) if (old != new) pci_write_config_word(pdev, PCI_COMMAND, new); } - pci_unblock_user_cfg_access(dev); + pci_unblock_user_cfg_access(pdev); return pending; } -- 1.7.10.4