Skip to content

Commit 033d5c6

Browse files
committed
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: Arnd Bergmann <arnd@arndb.de>
2 parents dc26ea3 + a8f5c98 commit 033d5c6

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

drivers/soc/hisilicon/kunpeng_hccs.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ static ssize_t link_fsm_show(struct kobject *kobj,
961961
struct hccs_link_status link_status = {0};
962962
const struct {
963963
u8 link_fsm;
964-
char *str;
964+
const char *str;
965965
} link_fsm_map[] = {
966966
{HCCS_PORT_RESET, "reset"},
967967
{HCCS_PORT_SETUP, "setup"},
@@ -1621,8 +1621,7 @@ static void hccs_remove_topo_dirs(struct hccs_dev *hdev)
16211621
hccs_remove_misc_sysfs(hdev);
16221622
}
16231623

1624-
static int hccs_create_hccs_dir(struct hccs_dev *hdev,
1625-
struct hccs_die_info *die,
1624+
static int hccs_create_hccs_dir(struct hccs_die_info *die,
16261625
struct hccs_port_info *port)
16271626
{
16281627
int ret;
@@ -1654,7 +1653,7 @@ static int hccs_create_die_dir(struct hccs_dev *hdev,
16541653

16551654
for (i = 0; i < die->port_num; i++) {
16561655
port = &die->ports[i];
1657-
ret = hccs_create_hccs_dir(hdev, die, port);
1656+
ret = hccs_create_hccs_dir(die, port);
16581657
if (ret) {
16591658
dev_err(hdev->dev, "create hccs%u dir failed.\n",
16601659
port->port_id);

0 commit comments

Comments
 (0)