From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 40B74C33CB3 for ; Tue, 28 Jan 2020 14:04:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 138092468E for ; Tue, 28 Jan 2020 14:04:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220252; bh=g2WSDlxo5RxUpQduXthRTFs/RfeO7stCcwZaTrhhb88=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=17uouoRFU7VoWmA2yp4QFroiv06W/4MmNaRzRjzyrYbwfLNG1JOaEvoG2ZPqnKw7S ahlsMrhubh4zCAokoaTupCAa8LyNU5LeeT1PIz5t2A1/InEj/Xz5aYIGH0qVGGf/t7 6lwcWWUUyaO8LhPvWxr+ll5LPWuOWKel1G+Fgb2U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727142AbgA1OEL (ORCPT ); Tue, 28 Jan 2020 09:04:11 -0500 Received: from mail.kernel.org ([198.145.29.99]:51154 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728022AbgA1OEK (ORCPT ); Tue, 28 Jan 2020 09:04:10 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 5D4162468D; Tue, 28 Jan 2020 14:04:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1580220249; bh=g2WSDlxo5RxUpQduXthRTFs/RfeO7stCcwZaTrhhb88=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Bfz31AWMwZsGPIOVn+5y5afTeM6p84dfXom1AJupRVxPJcrZk2w09tNurAZbKOdTy kqV0V2Y9eoWimIQNceHHD+WWTazyp5/kY8F7SHfJerbxSEF2L6hHHac6tBzjFpUHhj KnqNazPvcByF+kAPtE7iyhwWYBzFtuh0FXEDe/gM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "xiaofeng.yan" , Taehee Yoo , "David S. Miller" Subject: [PATCH 5.4 075/104] hsr: Fix a compilation error Date: Tue, 28 Jan 2020 15:00:36 +0100 Message-Id: <20200128135827.633270674@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200128135817.238524998@linuxfoundation.org> References: <20200128135817.238524998@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: xiaofeng.yan commit 80892772c4edac88c538165d26a0105f19b61c1c upstream. A compliation error happen when building branch 5.5-rc7 In file included from net/hsr/hsr_main.c:12:0: net/hsr/hsr_main.h:194:20: error: two or more data types in declaration specifiers static inline void void hsr_debugfs_rename(struct net_device *dev) So Removed one void. Fixes: 4c2d5e33dcd3 ("hsr: rename debugfs file when interface name is changed") Signed-off-by: xiaofeng.yan Acked-by: Taehee Yoo Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/hsr/hsr_main.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/net/hsr/hsr_main.h +++ b/net/hsr/hsr_main.h @@ -191,7 +191,7 @@ void hsr_debugfs_term(struct hsr_priv *p void hsr_debugfs_create_root(void); void hsr_debugfs_remove_root(void); #else -static inline void void hsr_debugfs_rename(struct net_device *dev) +static inline void hsr_debugfs_rename(struct net_device *dev) { } static inline void hsr_debugfs_init(struct hsr_priv *priv,