From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2F6C6A00C3; Wed, 15 Dec 2021 19:49:19 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ED6D140688; Wed, 15 Dec 2021 19:49:18 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id 5007140041 for ; Wed, 15 Dec 2021 19:49:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1639594157; x=1671130157; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=dBDgascdiySxaSXEkVr29qOBjLWtzlzAjorUPKXie5k=; b=AMAB9YOr2ghQQoA5wjphc3/vwL5yyCyLUDKpkyS2hEgRceFyDkNNyUfV KP5hIbAVsSjb4EknoqyVb+JqU2Bts5H3HuBTrb68uAGKDGeTx6rIrhnh3 Rf2SxAqNxyxDSjcXR6T5fZdMj7gGIZR1X1IMHPasmK4336loDuVYWGQl0 qPuAz86IYUA26f8aE4WUGR44+wa9vKJAYBMoULCfuSGnIbhQuCZYtJxof SSeyjTa90oCKCCee/yvvvufWMK4Hag4ss1nZJdiP3mrqdHWzwg0DuxqfN sig/aCNA3coG3dPAoMo/8y0gnLeCtsbJE7hoR9o/J/MWJ+Px2i/dUuHpL A==; X-IronPort-AV: E=McAfee;i="6200,9189,10199"; a="239531738" X-IronPort-AV: E=Sophos;i="5.88,207,1635231600"; d="scan'208";a="239531738" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Dec 2021 10:49:02 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.88,207,1635231600"; d="scan'208";a="545682610" Received: from silpixa00399752.ir.intel.com (HELO silpixa00399752.ger.corp.intel.com) ([10.237.222.27]) by orsmga001.jf.intel.com with ESMTP; 15 Dec 2021 10:49:01 -0800 From: Ferruh Yigit To: dev@dpdk.org Cc: Ferruh Yigit Subject: [dpdk-kmods] linux/igb_uio: fix build for switch fall through Date: Wed, 15 Dec 2021 18:48:59 +0000 Message-Id: <20211215184859.1859870-1-ferruh.yigit@intel.com> X-Mailer: git-send-email 2.33.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Linux is using '-Wimplicit-fallthrough=5' compiler option, which doesn't take any fall through comments into account but only uses compiler 'fallthrough' attribute to document fall through action is intended. "falls through" comment was used in the code which is causing a build error now, this patch converts comment to the 'fallthrough' macro defined in the Linux. To cover the case where Linux version doesn't have the macro, defined it in the compatibility header too. Signed-off-by: Ferruh Yigit --- linux/igb_uio/compat.h | 4 ++++ linux/igb_uio/igb_uio.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/linux/igb_uio/compat.h b/linux/igb_uio/compat.h index 8dbb896ae118..04ff7f60031f 100644 --- a/linux/igb_uio/compat.h +++ b/linux/igb_uio/compat.h @@ -152,3 +152,7 @@ static inline bool igbuio_kernel_is_locked_down(void) return false; #endif } + +#ifndef fallthrough +#define fallthrough do {} while (0) /* fallthrough */ +#endif diff --git a/linux/igb_uio/igb_uio.c b/linux/igb_uio/igb_uio.c index ea439d131de1..33e0e0286b69 100644 --- a/linux/igb_uio/igb_uio.c +++ b/linux/igb_uio/igb_uio.c @@ -250,7 +250,7 @@ igbuio_pci_enable_interrupts(struct rte_uio_pci_dev *udev) } #endif - /* falls through - to MSI */ + fallthrough; case RTE_INTR_MODE_MSI: #ifndef HAVE_ALLOC_IRQ_VECTORS if (pci_enable_msi(udev->pdev) == 0) { @@ -269,7 +269,7 @@ igbuio_pci_enable_interrupts(struct rte_uio_pci_dev *udev) break; } #endif - /* falls through - to INTX */ + fallthrough; case RTE_INTR_MODE_LEGACY: if (pci_intx_mask_supported(udev->pdev)) { dev_dbg(&udev->pdev->dev, "using INTX"); @@ -279,7 +279,7 @@ igbuio_pci_enable_interrupts(struct rte_uio_pci_dev *udev) break; } dev_notice(&udev->pdev->dev, "PCI INTX mask not supported\n"); - /* falls through - to no IRQ */ + fallthrough; case RTE_INTR_MODE_NONE: udev->mode = RTE_INTR_MODE_NONE; udev->info.irq = UIO_IRQ_NONE; -- 2.33.1