~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,17 +1,7 @@
	1	+// SPDX-License-Identifier: GPL-2.0
1	2	/*
2		- *
	3	+ * Copyright (c) 2013-2020, Intel Corporation. All rights reserved.
3	4	* Intel Management Engine Interface (Intel MEI) Linux driver
4		- * Copyright (c) 2013-2014, Intel Corporation.
5		- *
6		- * This program is free software; you can redistribute it and/or modify it
7		- * under the terms and conditions of the GNU General Public License,
8		- * version 2, as published by the Free Software Foundation.
9		- *
10		- * This program is distributed in the hope it will be useful, but WITHOUT
11		- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
12		- * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
13		- * more details.
14		- *
15	5	*/
16	6
17	7	#include <linux/pci.h>
..	..	@@ -670,14 +660,16 @@
670	660	}
671	661
672	662	/**
673		- * mei_txe_hw_config - configure hardware at the start of the devices
	663	+ * mei_txe_hw_config - configure hardware at the start of the devices
674	664	*
675	665	* @dev: the device structure
676	666	*
677	667	* Configure hardware at the start of the device should be done only
678	668	* once at the device probe time
	669	+ *
	670	+ * Return: always 0
679	671	*/
680		-static void mei_txe_hw_config(struct mei_device *dev)
	672	+static int mei_txe_hw_config(struct mei_device *dev)
681	673	{
682	674
683	675	struct mei_txe_hw *hw = to_txe_hw(dev);
..	..	@@ -687,6 +679,8 @@
687	679
688	680	dev_dbg(dev->dev, "aliveness_resp = 0x%08x, readiness = 0x%08x.\n",
689	681	hw->aliveness, hw->readiness);
	682	+
	683	+ return 0;
690	684	}
691	685
692	686	/**
..	..	@@ -1207,8 +1201,7 @@
1207	1201	struct mei_device *dev;
1208	1202	struct mei_txe_hw *hw;
1209	1203
1210		- dev = devm_kzalloc(&pdev->dev, sizeof(struct mei_device) +
1211		- sizeof(struct mei_txe_hw), GFP_KERNEL);
	1204	+ dev = devm_kzalloc(&pdev->dev, sizeof(dev) + sizeof(hw), GFP_KERNEL);
1212	1205	if (!dev)
1213	1206	return NULL;
1214	1207