From: Mario Limonciello Date: Thu, 23 Feb 2023 21:07:42 +0000 (-0600) Subject: thunderbolt: use `tb_eeprom_get_drom_offset` to discover DROM offset X-Git-Tag: v6.4-rc1~118^2~45^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8325b3227508459fab42f4f48fb232bc687f1ba;p=thirdparty%2Fkernel%2Flinux.git thunderbolt: use `tb_eeprom_get_drom_offset` to discover DROM offset The static function `tb_eeprom_get_drom_offset` has more safety guards for the DROM offset fetching. Use this instead of just `tb_sw_read` No intended functional changes. Signed-off-by: Mario Limonciello Signed-off-by: Mika Westerberg --- diff --git a/drivers/thunderbolt/eeprom.c b/drivers/thunderbolt/eeprom.c index c90d22f56d4e1..3b96a55295a0d 100644 --- a/drivers/thunderbolt/eeprom.c +++ b/drivers/thunderbolt/eeprom.c @@ -471,14 +471,13 @@ err: static int tb_drom_copy_nvm(struct tb_switch *sw, u16 *size) { - u32 drom_offset; + u16 drom_offset; int ret; if (!sw->dma_port) return -ENODEV; - ret = tb_sw_read(sw, &drom_offset, TB_CFG_SWITCH, - sw->cap_plug_events + 12, 1); + ret = tb_eeprom_get_drom_offset(sw, &drom_offset); if (ret) return ret;