From patchwork Wed Dec 30 14:57:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 355269 Delivered-To: patch@linaro.org Received: by 2002:a02:85a7:0:0:0:0:0 with SMTP id d36csp11395328jai; Wed, 30 Dec 2020 06:59:58 -0800 (PST) X-Google-Smtp-Source: ABdhPJyTMELSMGx4X2DhhKevQBkJehZNs/dXRJzPGwPYyqjDaedsFGlKTzp4nQPBdx0RPeHcShVa X-Received: by 2002:a50:fb85:: with SMTP id e5mr50322743edq.153.1609340398151; Wed, 30 Dec 2020 06:59:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1609340398; cv=none; d=google.com; s=arc-20160816; b=BoYXyw95GzG4okD9Trg+zn4hLMwQb6h1PYug1EMbQWloKcm5optmJ6CSrwGvPzf/Lx WjSFAWLFQA+vg19EshHFE6wnwEM2RYGhJxBW0AyVpKT2WG9uEvj/Cc0nwp0SDS6EiGIU l7V41qM3hhpqZ1GKtlom0hWglQ2gbgxHwLqMkBhgJPU83LTWlIAYhAsEdEUID/JO9Ye0 Qjq251G/NoGTSM+arxzOJyjY9UzTKDN5ThMaRViyvQwf4PoljwSRzPSKAF6BQS2U7Rn7 J6PkpyNKCsdnfLEKn9xgmHxgKhsgAb2Qe8Ese5xRNdPAyeFxFPbNIg0Eu7wOMjDae0HM IFOA== 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=mZDyrfl32t9w7+4rRy/FIb6jTwOM7meP6WFO8IB2Zs0=; b=qk2+AGgm11F0DtQ6O6/4IlSySIdp8r0dwycZDkl/W3C56/4YPduU03tCnZV6EIcEy6 mfpYHDE+e4nt1vLo8Q8TMWI+1IqQtueS6WAsUkk3iHN1ZSGwk/a3bIYyv3hVPtN9591M +Fz922fPGY/CXBYpxabhRnonspj93s52JUw2EBkw9Y7WYaGR5Gh2tgi0+G+dEuh2VPGH BrNOCvjCmzQKtXPbsQ1ptBxB68rXARJz7bEN70RHRLo5PUEiBWK4Zx3p3iPvyAQwjnDb amhlw7/GxC7f8YoBnnvvEa3chaz9OStNyX0TMBrmCHkl6uflFxcwIuAeVhoWEq+aSoZr bIgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UW34aLh1; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id eb6si23873429edb.497.2020.12.30.06.59.58; Wed, 30 Dec 2020 06:59:58 -0800 (PST) Received-SPF: pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=UW34aLh1; spf=pass (google.com: domain of netdev-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=netdev-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726658AbgL3O7M (ORCPT + 8 others); Wed, 30 Dec 2020 09:59:12 -0500 Received: from mail.kernel.org ([198.145.29.99]:39766 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726161AbgL3O7L (ORCPT ); Wed, 30 Dec 2020 09:59:11 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id D1C5921973; Wed, 30 Dec 2020 14:58:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1609340310; bh=YmXXZasBhC28kFabVxJRx0dXwyd4dmoFQ/gA9h33sCo=; h=From:To:Cc:Subject:Date:From; b=UW34aLh145QaqjBnp+g6dzEwT+Oueu1jffOyUTwBaoepdYBlMQ/IvRhOH0OU79Ntx 5rc6EZOchQ394ucyO/7FRiDl/DcRRqmb8gLpoO7saF8Caju+ZNt6ojeLTpId+v2emU BHA6nKigaeOQRewQxVSdBRQXeg6m85l3NhHeaGQv0+DXpI2599jM3ec3Lhtvd5gsFx QJ59lICWsUvlUFwnIOq0FwBRQ//WeqbdqetvUW/oki/c4bNz/GinNyw++/4hK9P+6i Cn+H+sKLrODLDOYgaISGmsOBtqeWDiOV9HB8omGlnvObaLRXttoSMAxttec22XtU8C sQoYl4Vh+5+HA== From: Arnd Bergmann To: Felix Fietkau , Lorenzo Bianconi Cc: Arnd Bergmann , Ryder Lee , Kalle Valo , "David S. Miller" , Jakub Kicinski , Matthias Brugger , Sean Wang , Wan-Feng Jiang , Shayne Chen , Yiwei Chung , linux-wireless@vger.kernel.org, netdev@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] mt76: fix enum conversion warning Date: Wed, 30 Dec 2020 15:57:55 +0100 Message-Id: <20201230145824.3203726-1-arnd@kernel.org> X-Mailer: git-send-email 2.29.2 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Arnd Bergmann A recent patch changed some enum values, but not the type declaration for the assignment: drivers/net/wireless/mediatek/mt76/mt7615/mcu.c:238:9: error: implicit conversion from enumeration type 'enum mt76_mcuq_id' to different enumeration type 'enum mt76_txq_id' [-Werror,-Wenum-conversion] qid = MT_MCUQ_WM; ~ ^~~~~~~~~~ drivers/net/wireless/mediatek/mt76/mt7615/mcu.c:240:9: error: implicit conversion from enumeration type 'enum mt76_mcuq_id' to different enumeration type 'enum mt76_txq_id' [-Werror,-Wenum-conversion] qid = MT_MCUQ_FWDL; ~ ^~~~~~~~~~~~ Change the type to match again. Fixes: e637763b606b ("mt76: move mcu queues to mt76_dev q_mcu array") Signed-off-by: Arnd Bergmann --- drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 2 +- drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- 2.29.2 diff --git a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c index a44b7766dec6..c13547841a4e 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7615/mcu.c @@ -231,7 +231,7 @@ mt7615_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb, int cmd, int *seq) { struct mt7615_dev *dev = container_of(mdev, struct mt7615_dev, mt76); - enum mt76_txq_id qid; + enum mt76_mcuq_id qid; mt7615_mcu_fill_msg(dev, skb, cmd, seq); if (test_bit(MT76_STATE_MCU_RUNNING, &dev->mphy.state)) diff --git a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c index 5fdd1a6d32ee..22753fbb05e5 100644 --- a/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c +++ b/drivers/net/wireless/mediatek/mt76/mt7915/mcu.c @@ -256,7 +256,7 @@ mt7915_mcu_send_message(struct mt76_dev *mdev, struct sk_buff *skb, struct mt7915_dev *dev = container_of(mdev, struct mt7915_dev, mt76); struct mt7915_mcu_txd *mcu_txd; u8 seq, pkt_fmt, qidx; - enum mt76_txq_id txq; + enum mt76_mcuq_id txq; __le32 *txd; u32 val;