[SRU][Jammy:linux-intel-iotg][PATCH v2 2/3] UBUNTU: SAUCE: net: fix compile error for Intel vnic driver

[Jian Hui Lee]

BugLink: https://bugs.launchpad.net/bugs/1943524

Update data structure to meet version 5.15. This is related to commit
e22f6f9e64307abc3022b3264d81e3b7fba57ea9.

Signed-off-by: Jian Hui Lee <jianhui.lee at canonical.com>
---
 drivers/net/vnic/eth-ishtp.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/drivers/net/vnic/eth-ishtp.c b/drivers/net/vnic/eth-ishtp.c
index 9b4df45f423e..b4751ef275b5 100644
--- a/drivers/net/vnic/eth-ishtp.c
+++ b/drivers/net/vnic/eth-ishtp.c
@@ -29,9 +29,12 @@
 #define ETH_ISHTP_MIN_MTU (ETH_ZLEN - ETH_HLEN)
 #define ETH_ISHTP_MAX_MTU  ETH_ISHTP_DATA_BUFLEN
 
-static const guid_t eth_ishtp_uuid =
-	GUID_INIT(0xeb83e1fb, 0x4c61, 0x4829,
-		  0x98, 0x4c, 0x3, 0x23, 0xab, 0x4b, 0x41, 0x65);
+static const struct ishtp_device_id eth_ishtp_uuid[] = {
+	{ .guid = GUID_INIT(0xeb83e1fb, 0x4c61, 0x4829,
+		  0x98, 0x4c, 0x3, 0x23, 0xab, 0x4b, 0x41, 0x65), },
+	{ }
+};
+MODULE_DEVICE_TABLE(ishtp, eth_ishtp_uuid);
 
 struct eth_ishtp_prv {
 	struct device *dev;
@@ -219,7 +222,7 @@ static int eth_ishtp_dev_init(struct net_device *dev)
 	ishtp_set_rx_ring_size(eth_ishtp_cl, ETH_ISHTP_CL_RX_RING_SIZE);
 
 	ishtp_dev = ishtp_get_ishtp_device(eth_ishtp_cl);
-	fw_client = ishtp_fw_cl_get_client(ishtp_dev, &eth_ishtp_uuid);
+	fw_client = ishtp_fw_cl_get_client(ishtp_dev, &eth_ishtp_uuid[0].guid);
 	if (!fw_client) {
 		dev_err(prv->dev, "FW client not found\n");
 		ret = -ENOENT;
@@ -368,7 +371,7 @@ static void eth_ishtp_reset(struct work_struct *work)
 		ishtp_set_tx_ring_size(eth_ishtp_cl, ETH_ISHTP_CL_TX_RING_SIZE);
 		ishtp_set_rx_ring_size(eth_ishtp_cl, ETH_ISHTP_CL_RX_RING_SIZE);
 
-		fw_client = ishtp_fw_cl_get_client(ishtp_dev, &eth_ishtp_uuid);
+		fw_client = ishtp_fw_cl_get_client(ishtp_dev, &eth_ishtp_uuid[0].guid);
 		if (!fw_client) {
 			dev_err(ishtp_device(prv->cl_device),
 				"Don't find related fw client\n");
@@ -418,18 +421,17 @@ static int eth_ishtp_cl_reset(struct ishtp_cl_device *cl_device)
 	return 0;
 }
 
-static int eth_ishtp_cl_remove(struct ishtp_cl_device *cl_device)
+static void eth_ishtp_cl_remove(struct ishtp_cl_device *cl_device)
 {
 	struct eth_ishtp_prv *prv;
 
 	prv = ishtp_get_drvdata(cl_device);
 	if (!prv)
-		return -ENODEV;
+		return;
 
 	unregister_netdev(prv->net_dev);
 	free_netdev(prv->net_dev);
 	ishtp_put_device(cl_device);
-	return 0;
 }
 
 static int eth_ishtp_cl_probe(struct ishtp_cl_device *cl_device)
@@ -472,7 +474,7 @@ static int eth_ishtp_cl_probe(struct ishtp_cl_device *cl_device)
 
 static struct ishtp_cl_driver eth_ishtp_cl_driver = {
 	.name = ETH_ISHTP_DRV_NAME,
-	.guid = &eth_ishtp_uuid,
+	.id = eth_ishtp_uuid,
 	.probe = eth_ishtp_cl_probe,
 	.remove = eth_ishtp_cl_remove,
 	.reset = eth_ishtp_cl_reset,
-- 
2.34.1