From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from m16.mail.163.com (m16.mail.163.com [220.197.31.3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 308C947DD45; Thu, 30 Apr 2026 16:25:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=220.197.31.3 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566311; cv=none; b=PHL9bRdLqshWWuHXEipBNmqQilM6C8DJs66sKShvB1twQ4fT88XOsyv1gRnWAYsw4jjttFr6dom9GUBxVgVHUoenJ5NOHDy6aI/Mfutm9gHX56g/WvlU3B9HF9YF+dCaxFZfYPEYMetHn7WOiSFgSdbTjkLigwGLrp4QmsN67Q4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1777566311; c=relaxed/simple; bh=kWLXzGvNQCyVvpBjxUULMbl2qVzLrafiBrAxhget9ww=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iiQIzxrq5kp5mtrTpWeZTQQpACS6jsa+3NqnhtmKykk0UXfOWIR82Or965+FyQ8AOi07pgGScUpzTcXjviA5wSHxgi+Afp2I+JjBMVaafGSsVKeD9BEycTBAE3R0BvdL9N1L16peVLGV8Ybw0tgrDKf/9r7i7cDVSvuJKJ7v4aw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com; spf=pass smtp.mailfrom=163.com; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b=LyVVIr7u; arc=none smtp.client-ip=220.197.31.3 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=163.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=163.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=163.com header.i=@163.com header.b="LyVVIr7u" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=yI MCJJEglyEHgy/8KND7/lOemDk9Of90Cg3VIrBcc4k=; b=LyVVIr7u8ejD5/wAER fGUFImA47Q7lSjYgLURK49eKljRsKaSeUSiDRR3PG8/jcgM/moCSVYScW2nc59r0 cz54GRX+CR88hIdkdOooAmJkrmHPWV9p466/bHzV9L+pI3IKL1/CtghAlkgUr3N3 uJCJChTVz2zgHnMRIngsM4el4= Received: from zhb.. (unknown []) by gzga-smtp-mtada-g1-2 (Coremail) with SMTP id _____wA3Df0_gvNpcypXCg--.51103S2; Fri, 01 May 2026 00:24:31 +0800 (CST) From: Hans Zhang <18255117159@163.com> To: bhelgaas@google.com, lpieralisi@kernel.org, kwilczynski@kernel.org, mani@kernel.org, jingoohan1@gmail.com Cc: robh@kernel.org, s32@nxp.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, Hans Zhang <18255117159@163.com> Subject: [RESEND PATCH 08/16] PCI/CARDBUS: Use FIELD_MODIFY() Date: Fri, 1 May 2026 00:24:12 +0800 Message-Id: <20260430162420.42839-9-18255117159@163.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260430162420.42839-1-18255117159@163.com> References: <20260430162420.42839-1-18255117159@163.com> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:_____wA3Df0_gvNpcypXCg--.51103S2 X-Coremail-Antispam: 1Uf129KBjvdXoWrur17tw4ftFW3KrWktr43KFg_yoWfKwc_Wr n7ZFs7Ar4DAF1vyw45Cr1fA3s09a15Xryv93Z3ta4ayr1vqasY9FZxWrykZFyDuw4ruF9I grZrJr1ruF9FyjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7VUUbAw3UUUUU== X-CM-SenderInfo: rpryjkyvrrlimvzbiqqrwthudrp/xtbC7B8Hqmnzgj9N1QAA3h Use FIELD_MODIFY() to remove open-coded bit manipulation. No functional change intended. Signed-off-by: Hans Zhang <18255117159@163.com> --- drivers/pci/setup-cardbus.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/pci/setup-cardbus.c b/drivers/pci/setup-cardbus.c index 1ebd13a1f730..f7c62054f227 100644 --- a/drivers/pci/setup-cardbus.c +++ b/drivers/pci/setup-cardbus.c @@ -253,8 +253,7 @@ int pci_cardbus_scan_bridge_extend(struct pci_bus *bus, struct pci_dev *dev, * yenta.c forces a secondary latency timer of 176. * Copy that behaviour here. */ - buses &= ~PCI_SEC_LATENCY_TIMER_MASK; - buses |= FIELD_PREP(PCI_SEC_LATENCY_TIMER_MASK, CARDBUS_LATENCY_TIMER); + FIELD_MODIFY(PCI_SEC_LATENCY_TIMER_MASK, &buses, CARDBUS_LATENCY_TIMER); /* We need to blast all three values with a single write */ pci_write_config_dword(dev, PCI_PRIMARY_BUS, buses); -- 2.34.1