Unverified Commit 4507d205 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'hisi-drivers-for-6.17' of https://github.com/hisilicon/linux-hisi into soc/drivers 

HiSilicon driver updates for v6.17

- Print the hardware ID instead of the index in the HCCS driver

* tag 'hisi-drivers-for-6.17' of https://github.com/hisilicon/linux-hisi:
  soc: hisilicon: kunpeng_hccs: Fix incorrect log information

Link: https://lore.kernel.org/r/6879FFED.1050002@hisilicon.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents edf0a405 b1136432

drivers/soc/hisilicon/kunpeng_hccs.c

+2 −2
Original line number Diff line number Diff line
@@ -1295,11 +1295,11 @@ static int hccs_get_all_spec_port_idle_sta(struct hccs_dev *hdev, u8 port_type, 
				if (ret) {

					dev_err(hdev->dev,

						"hccs%u on chip%u/die%u get idle status failed, ret = %d.\n",

						k, i, j, ret);

						port->port_id, chip->chip_id, die->die_id, ret);

					return ret;

				} else if (idle == 0) {

					dev_info(hdev->dev, "hccs%u on chip%u/die%u is busy.\n",

						k, i, j);

						 port->port_id, chip->chip_id, die->die_id);

					return 0;

				}

			}