Unverified Commit 033d5c6c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

HiSilicon driver updates for v7.1

- Fix two compiler warnings on kunpeng_hccs driver

* tag 'hisi-drivers-for-7.1' of https://github.com/hisilicon/linux-hisi

:
  soc: hisilicon: kunpeng_hccs: Remove unused input parameter
  soc: hisilicon: kunpeng_hccs: Fix discard ‘const’ qualifier compiling warning

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

drivers/soc/hisilicon/kunpeng_hccs.c

+3 −4
Original line number Diff line number Diff line
@@ -961,7 +961,7 @@ static ssize_t link_fsm_show(struct kobject *kobj, 
	struct hccs_link_status link_status = {0};

	const struct {

		u8 link_fsm;

		char *str;

		const char *str;

	} link_fsm_map[] = {

		{HCCS_PORT_RESET, "reset"},

		{HCCS_PORT_SETUP, "setup"},
@@ -1621,8 +1621,7 @@ static void hccs_remove_topo_dirs(struct hccs_dev *hdev) 
	hccs_remove_misc_sysfs(hdev);

}



static int hccs_create_hccs_dir(struct hccs_dev *hdev,

				struct hccs_die_info *die,

static int hccs_create_hccs_dir(struct hccs_die_info *die,

				struct hccs_port_info *port)

{

	int ret;
@@ -1654,7 +1653,7 @@ static int hccs_create_die_dir(struct hccs_dev *hdev, 


	for (i = 0; i < die->port_num; i++) {

		port = &die->ports[i];

		ret = hccs_create_hccs_dir(hdev, die, port);

		ret = hccs_create_hccs_dir(die, port);

		if (ret) {

			dev_err(hdev->dev, "create hccs%u dir failed.\n",

				port->port_id);