From: Iouri Tarassov <[email protected]>
Signed-off-by: Iouri Tarassov <[email protected]>
[kms: forward port to 6.6 from 6.1. No code changes made.]
Signed-off-by: Kelsey Steele <[email protected]>
---
drivers/hv/dxgkrnl/dxgadapter.c | 12 ++++--------
drivers/hv/dxgkrnl/dxgkrnl.h | 6 +++---
drivers/hv/dxgkrnl/dxgvmbus.c | 2 +-
drivers/hv/dxgkrnl/ioctl.c | 20 +++++++-------------
4 files changed, 15 insertions(+), 25 deletions(-)
diff --git a/drivers/hv/dxgkrnl/dxgadapter.c b/drivers/hv/dxgkrnl/dxgadapter.c
index bcd19b7267d1..b8ae8099847b 100644
--- a/drivers/hv/dxgkrnl/dxgadapter.c
+++ b/drivers/hv/dxgkrnl/dxgadapter.c
@@ -1017,8 +1017,7 @@ struct dxgprocess_adapter
*dxgprocess_adapter_create(struct dxgprocess *process,
}
return adapter_info;
cleanup:
- if (adapter_info)
- kfree(adapter_info);
+ kfree(adapter_info);
return NULL;
}
@@ -1225,10 +1224,8 @@ struct dxgsyncobject *dxgsyncobject_create(struct
dxgprocess *process,
DXG_TRACE("Syncobj created: %p", syncobj);
return syncobj;
cleanup:
- if (syncobj->host_event)
- kfree(syncobj->host_event);
- if (syncobj)
- kfree(syncobj);
+ kfree(syncobj->host_event);
+ kfree(syncobj);
return NULL;
}
@@ -1308,8 +1305,7 @@ void dxgsyncobject_release(struct kref *refcount)
kref_put(&syncobj->shared_owner->ssyncobj_kref,
dxgsharedsyncobj_release);
}
- if (syncobj->host_event)
- kfree(syncobj->host_event);
+ kfree(syncobj->host_event);
kfree(syncobj);
}
diff --git a/drivers/hv/dxgkrnl/dxgkrnl.h b/drivers/hv/dxgkrnl/dxgkrnl.h
index 9599ec8e0f1d..a4d0c504668b 100644
--- a/drivers/hv/dxgkrnl/dxgkrnl.h
+++ b/drivers/hv/dxgkrnl/dxgkrnl.h
@@ -47,10 +47,10 @@ struct dxghwqueue;
* Driver private data.
* A single /dev/dxg device is created per virtual machine.
*/
-struct dxgdriver{
+struct dxgdriver {
struct dxgglobal *dxgglobal;
- struct device *dxgdev;
- struct pci_driver pci_drv;
+ struct device *dxgdev;
+ struct pci_driver pci_drv;
struct hv_driver vmbus_drv;
};
extern struct dxgdriver dxgdrv;
diff --git a/drivers/hv/dxgkrnl/dxgvmbus.c b/drivers/hv/dxgkrnl/dxgvmbus.c
index de28c6162a70..215e2f6648e2 100644
--- a/drivers/hv/dxgkrnl/dxgvmbus.c
+++ b/drivers/hv/dxgkrnl/dxgvmbus.c
@@ -246,7 +246,7 @@ int dxgvmbuschannel_init(struct dxgvmbuschannel *ch, struct
hv_device *hdev)
goto cleanup;
}
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,15,0)
+#if KERNEL_VERSION(5, 15, 0) <= LINUX_VERSION_CODE
hdev->channel->max_pkt_size = DXG_MAX_VM_BUS_PACKET_SIZE;
#endif
ret = vmbus_open(hdev->channel, RING_BUFSIZE, RING_BUFSIZE,
diff --git a/drivers/hv/dxgkrnl/ioctl.c b/drivers/hv/dxgkrnl/ioctl.c
index f8ca79d098f3..5ac6dd1f09b9 100644
--- a/drivers/hv/dxgkrnl/ioctl.c
+++ b/drivers/hv/dxgkrnl/ioctl.c
@@ -3162,8 +3162,7 @@ dxgkio_signal_sync_object(struct dxgprocess *process,
void *__user inargs)
}
if (event)
eventfd_ctx_put(event);
- if (host_event)
- kfree(host_event);
+ kfree(host_event);
}
if (adapter)
dxgadapter_release_lock_shared(adapter);
@@ -3398,8 +3397,7 @@ dxgkio_signal_sync_object_gpu2(struct dxgprocess
*process, void *__user inargs)
}
if (event)
eventfd_ctx_put(event);
- if (host_event)
- kfree(host_event);
+ kfree(host_event);
}
if (adapter)
dxgadapter_release_lock_shared(adapter);
@@ -3577,8 +3575,7 @@ dxgkio_wait_sync_object_cpu(struct dxgprocess *process,
void *__user inargs)
}
if (event)
eventfd_ctx_put(event);
- if (async_host_event)
- kfree(async_host_event);
+ kfree(async_host_event);
}
DXG_TRACE_IOCTL_END(ret);
@@ -4438,7 +4435,7 @@ build_test_command_buffer(struct dxgprocess *process,
if (cmd.dma_buffer_size < sizeof(u32) ||
cmd.dma_buffer_size > D3DDDI_MAXTESTBUFFERSIZE ||
cmd.dma_buffer_priv_data_size >
- D3DDDI_MAXTESTBUFFERPRIVATEDRIVERDATASIZE) {
+ D3DDDI_MAXTESTBUFFERPRIVATEDRIVERDATASIZE) {
DXG_ERR("Invalid DMA buffer or private data size");
return -EINVAL;
}
@@ -4511,8 +4508,7 @@ driver_known_escape(struct dxgprocess *process,
enum d3dkmt_escapetype escape_type;
int ret = 0;
- if (args->priv_drv_data_size < sizeof(enum d3dddi_knownescapetype))
- {
+ if (args->priv_drv_data_size < sizeof(enum d3dddi_knownescapetype)) {
DXG_ERR("Invalid private data size");
return -EINVAL;
}
@@ -5631,10 +5627,8 @@ void dxgk_validate_ioctls(void)
{
int i;
- for (i=0; i < ARRAY_SIZE(ioctls); i++)
- {
- if (ioctls[i].ioctl && _IOC_NR(ioctls[i].ioctl) != i)
- {
+ for (i = 0; i < ARRAY_SIZE(ioctls); i++) {
+ if (ioctls[i].ioctl && _IOC_NR(ioctls[i].ioctl) != i) {
DXG_ERR("Invalid ioctl");
DXGKRNL_ASSERT(0);
}
