Skip to content

Commit 3b8c56d

Browse files
committed
firmware: arm_scmi: use ioread64() instead of ioread64_hi_lo()
The scmi_common_fastchannel_db_ring() function calls either ioread64() or ioread64_hi_lo() depending on whether it is compiler for 32-bit or 64-bit architectures. The same logic is used to define ioread64() itself in the linux/io-64-nonatomic-hi-lo.h header file, so the special case is not really needed. The behavior here should not change at all. Fixes: 6f9ea4d ("firmware: arm_scmi: Generalize the fast channel support") Reviewed-by: Sudeep Holla <sudeep.holla@arm.com> Link: https://lore.kernel.org/r/20250304144346.1025658-1-arnd@kernel.org Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1 parent 4f1afea commit 3b8c56d

1 file changed

Lines changed: 0 additions & 10 deletions

File tree

drivers/firmware/arm_scmi/driver.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1997,17 +1997,7 @@ static void scmi_common_fastchannel_db_ring(struct scmi_fc_db_info *db)
19971997
else if (db->width == 4)
19981998
SCMI_PROTO_FC_RING_DB(32);
19991999
else /* db->width == 8 */
2000-
#ifdef CONFIG_64BIT
20012000
SCMI_PROTO_FC_RING_DB(64);
2002-
#else
2003-
{
2004-
u64 val = 0;
2005-
2006-
if (db->mask)
2007-
val = ioread64_hi_lo(db->addr) & db->mask;
2008-
iowrite64_hi_lo(db->set | val, db->addr);
2009-
}
2010-
#endif
20112001
}
20122002

20132003
/**

0 commit comments

Comments
 (0)