From patchwork Thu Jun 22 15:54:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 111760 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp5182860vqr; Thu, 22 Jun 2023 09:13:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7nd4K2f69duFc5bZhi89ZGn/+gRQygGbVFujALoCWJOWO2yXqVO1rfGMaYds/YK04DglUL X-Received: by 2002:a92:c044:0:b0:342:89b4:b8b1 with SMTP id o4-20020a92c044000000b0034289b4b8b1mr10486763ilf.21.1687450436364; Thu, 22 Jun 2023 09:13:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687450436; cv=none; d=google.com; s=arc-20160816; b=T4gXaL5kfweN2a1SRYSu5BpBb7KleCDHUPUaNdsx9yIg2XQQZ4dx6AgdcIsSZAAge3 B8rooWMeF2kSNDyvX1Yac278BOv7yUszIZXl9AwD+IAkHQdPdSu9QviZbL3eD+SCm5Uh eVpEbRliVyH+cTRCLATA3thZGgn1HQ4Q/b2/gc8NfWQKviNQfn7BbMiPbfa9eNcps1wH 20CPkUsHFjcMUhkII6w45bdVm95DgAffFOXc7S2jUpvamJN+QGtIR1GPT+FH7Z0/Ee5S NVpeN0eI7b8tvLvtPsv+ETG5un4wxA5jQmBIgHLrnPpCdrBDoqnJ/FHtRGMTvWf+Q0Vl eVHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=xyLbNzZ/cBspjKpPk46G3AEQd+aThHsA32OlsyTI2uY=; b=fslfT37YG/xFbu+Rw3Ow+TDzPIuhbNIjk22Dmb8YMR/MQwzCcXw90LtS8XoGPd8WbK njKJwKvgOzYoiani2MnrkdiuaD9W2/oXapprTKyY0WS5ugUndIRoS40jPERu76Q++8gW 541CMWxpUqD7pbFOph2yv3iQaTl1chC1RHk0l4pOs8krVyqqi/Wpo4cswAuJpF11Jz1E TmGpnp+rbtyHj/Q1RqhuED9uahsWlb89M1Sn+NhlYlr8uqBsNxeFcyjAFo9tIXr2bBMA sqdYjxeu9yqvzTXmJKLl9v+xjdy5Nx4k793kgcgYjC+FuocYrgo4XVSHgOvGJf/M1lMd MvEA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=z1nNxx71; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id a12-20020a63704c000000b005347d133470si1782759pgn.385.2023.06.22.09.13.43; Thu, 22 Jun 2023 09:13:56 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=z1nNxx71; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231547AbjFVPyQ (ORCPT + 99 others); Thu, 22 Jun 2023 11:54:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43102 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231151AbjFVPyP (ORCPT ); Thu, 22 Jun 2023 11:54:15 -0400 Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 888FD10F8; Thu, 22 Jun 2023 08:54:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=xyLbNzZ/cBspjKpPk46G3AEQd+aThHsA32OlsyTI2uY=; b=z1nNxx71rlhpqa2DBWP5mZ3LMv 68WRdxR+w6RcUjAX5uM6xXewmBngVeMOIfBjnQchk42q77qWQDnD3RFrw86YUrgTVIIxU1jqqhuW5 YUac2edCy4RNDSGoVZL716AJIPzw/+fpCZNuY+7bbDbmjhCV+EZNb2aVy+jzXkVitBez5AdsVmEf+ dauMnuxi62mi79HjlJ34nS4teh3hLCImCqKNcmANLw1FjqGqW/K3XmPs46peEhQBccNhde1rkqRqj epMoVTOEb88FMv2PB0BAWuRkXztaetsGm5471a9TU1Fv205BWS3wRWQazPyhUOmnxcsGZ7mGT1gNi a/oNe5kw==; Received: from [2601:1c2:980:9ec0::2764] (helo=bombadil.infradead.org) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qCMdP-001AeD-24; Thu, 22 Jun 2023 15:54:11 +0000 From: Randy Dunlap To: linux-kernel@vger.kernel.org Cc: Randy Dunlap , kernel test robot , Alexandra Winter , Wenjia Zhang , linux-s390@vger.kernel.org, netdev@vger.kernel.org, Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Sven Schnelle , "David S . Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni Subject: [PATCH] revert "s390/net: lcs: use IS_ENABLED() for kconfig detection" Date: Thu, 22 Jun 2023 08:54:09 -0700 Message-ID: <20230622155409.27311-1-rdunlap@infradead.org> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769420028537487172?= X-GMAIL-MSGID: =?utf-8?q?1769420028537487172?= The referenced patch is causing build errors when ETHERNET=y and FDDI=m. While we work out the preferred patch(es), revert this patch to make the pain go away. Fixes: 128272336120 ("s390/net: lcs: use IS_ENABLED() for kconfig detection") Signed-off-by: Randy Dunlap Reported-by: kernel test robot Link: lore.kernel.org/r/202306202129.pl0AqK8G-lkp@intel.com Cc: Alexandra Winter Cc: Wenjia Zhang Cc: linux-s390@vger.kernel.org Cc: netdev@vger.kernel.org Cc: Heiko Carstens Cc: Vasily Gorbik Cc: Alexander Gordeev Cc: Christian Borntraeger Cc: Sven Schnelle Cc: David S. Miller Cc: Eric Dumazet Cc: Jakub Kicinski Cc: Paolo Abeni Reviewed-by: Simon Horman --- drivers/s390/net/lcs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff -- a/drivers/s390/net/lcs.c b/drivers/s390/net/lcs.c --- a/drivers/s390/net/lcs.c +++ b/drivers/s390/net/lcs.c @@ -36,7 +36,7 @@ #include "lcs.h" -#if !IS_ENABLED(CONFIG_ETHERNET) && !IS_ENABLED(CONFIG_FDDI) +#if !defined(CONFIG_ETHERNET) && !defined(CONFIG_FDDI) #error Cannot compile lcs.c without some net devices switched on. #endif @@ -1601,14 +1601,14 @@ lcs_startlan_auto(struct lcs_card *card) int rc; LCS_DBF_TEXT(2, trace, "strtauto"); -#if IS_ENABLED(CONFIG_ETHERNET) +#ifdef CONFIG_ETHERNET card->lan_type = LCS_FRAME_TYPE_ENET; rc = lcs_send_startlan(card, LCS_INITIATOR_TCPIP); if (rc == 0) return 0; #endif -#if IS_ENABLED(CONFIG_FDDI) +#ifdef CONFIG_FDDI card->lan_type = LCS_FRAME_TYPE_FDDI; rc = lcs_send_startlan(card, LCS_INITIATOR_TCPIP); if (rc == 0) @@ -2139,13 +2139,13 @@ lcs_new_device(struct ccwgroup_device *c goto netdev_out; } switch (card->lan_type) { -#if IS_ENABLED(CONFIG_ETHERNET) +#ifdef CONFIG_ETHERNET case LCS_FRAME_TYPE_ENET: card->lan_type_trans = eth_type_trans; dev = alloc_etherdev(0); break; #endif -#if IS_ENABLED(CONFIG_FDDI) +#ifdef CONFIG_FDDI case LCS_FRAME_TYPE_FDDI: card->lan_type_trans = fddi_type_trans; dev = alloc_fddidev(0);