Skip to content

Commit e6ba173

Browse files
Iouri Tarassovchessturo
authored andcommitted
drivers: hv: dxgkrnl: Fixed coding style issues
Signed-off-by: Iouri Tarassov <iourit@linux.microsoft.com> [kms: forward port to 6.6 from 6.1. No code changes made.] Signed-off-by: Kelsey Steele <kelseysteele@microsoft.com>
1 parent 11188a6 commit e6ba173

4 files changed

Lines changed: 15 additions & 25 deletions

File tree

drivers/hv/dxgkrnl/dxgadapter.c

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1017,8 +1017,7 @@ struct dxgprocess_adapter *dxgprocess_adapter_create(struct dxgprocess *process,
10171017
}
10181018
return adapter_info;
10191019
cleanup:
1020-
if (adapter_info)
1021-
kfree(adapter_info);
1020+
kfree(adapter_info);
10221021
return NULL;
10231022
}
10241023

@@ -1225,10 +1224,8 @@ struct dxgsyncobject *dxgsyncobject_create(struct dxgprocess *process,
12251224
DXG_TRACE("Syncobj created: %p", syncobj);
12261225
return syncobj;
12271226
cleanup:
1228-
if (syncobj->host_event)
1229-
kfree(syncobj->host_event);
1230-
if (syncobj)
1231-
kfree(syncobj);
1227+
kfree(syncobj->host_event);
1228+
kfree(syncobj);
12321229
return NULL;
12331230
}
12341231

@@ -1308,8 +1305,7 @@ void dxgsyncobject_release(struct kref *refcount)
13081305
kref_put(&syncobj->shared_owner->ssyncobj_kref,
13091306
dxgsharedsyncobj_release);
13101307
}
1311-
if (syncobj->host_event)
1312-
kfree(syncobj->host_event);
1308+
kfree(syncobj->host_event);
13131309
kfree(syncobj);
13141310
}
13151311

drivers/hv/dxgkrnl/dxgkrnl.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@ struct dxghwqueue;
4747
* Driver private data.
4848
* A single /dev/dxg device is created per virtual machine.
4949
*/
50-
struct dxgdriver{
50+
struct dxgdriver {
5151
struct dxgglobal *dxgglobal;
52-
struct device *dxgdev;
53-
struct pci_driver pci_drv;
52+
struct device *dxgdev;
53+
struct pci_driver pci_drv;
5454
struct hv_driver vmbus_drv;
5555
};
5656
extern struct dxgdriver dxgdrv;

drivers/hv/dxgkrnl/dxgvmbus.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ int dxgvmbuschannel_init(struct dxgvmbuschannel *ch, struct hv_device *hdev)
246246
goto cleanup;
247247
}
248248

249-
#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,15,0)
249+
#if KERNEL_VERSION(5, 15, 0) <= LINUX_VERSION_CODE
250250
hdev->channel->max_pkt_size = DXG_MAX_VM_BUS_PACKET_SIZE;
251251
#endif
252252
ret = vmbus_open(hdev->channel, RING_BUFSIZE, RING_BUFSIZE,

drivers/hv/dxgkrnl/ioctl.c

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3162,8 +3162,7 @@ dxgkio_signal_sync_object(struct dxgprocess *process, void *__user inargs)
31623162
}
31633163
if (event)
31643164
eventfd_ctx_put(event);
3165-
if (host_event)
3166-
kfree(host_event);
3165+
kfree(host_event);
31673166
}
31683167
if (adapter)
31693168
dxgadapter_release_lock_shared(adapter);
@@ -3398,8 +3397,7 @@ dxgkio_signal_sync_object_gpu2(struct dxgprocess *process, void *__user inargs)
33983397
}
33993398
if (event)
34003399
eventfd_ctx_put(event);
3401-
if (host_event)
3402-
kfree(host_event);
3400+
kfree(host_event);
34033401
}
34043402
if (adapter)
34053403
dxgadapter_release_lock_shared(adapter);
@@ -3577,8 +3575,7 @@ dxgkio_wait_sync_object_cpu(struct dxgprocess *process, void *__user inargs)
35773575
}
35783576
if (event)
35793577
eventfd_ctx_put(event);
3580-
if (async_host_event)
3581-
kfree(async_host_event);
3578+
kfree(async_host_event);
35823579
}
35833580

35843581
DXG_TRACE_IOCTL_END(ret);
@@ -4438,7 +4435,7 @@ build_test_command_buffer(struct dxgprocess *process,
44384435
if (cmd.dma_buffer_size < sizeof(u32) ||
44394436
cmd.dma_buffer_size > D3DDDI_MAXTESTBUFFERSIZE ||
44404437
cmd.dma_buffer_priv_data_size >
4441-
D3DDDI_MAXTESTBUFFERPRIVATEDRIVERDATASIZE) {
4438+
D3DDDI_MAXTESTBUFFERPRIVATEDRIVERDATASIZE) {
44424439
DXG_ERR("Invalid DMA buffer or private data size");
44434440
return -EINVAL;
44444441
}
@@ -4511,8 +4508,7 @@ driver_known_escape(struct dxgprocess *process,
45114508
enum d3dkmt_escapetype escape_type;
45124509
int ret = 0;
45134510

4514-
if (args->priv_drv_data_size < sizeof(enum d3dddi_knownescapetype))
4515-
{
4511+
if (args->priv_drv_data_size < sizeof(enum d3dddi_knownescapetype)) {
45164512
DXG_ERR("Invalid private data size");
45174513
return -EINVAL;
45184514
}
@@ -5631,10 +5627,8 @@ void dxgk_validate_ioctls(void)
56315627
{
56325628
int i;
56335629

5634-
for (i=0; i < ARRAY_SIZE(ioctls); i++)
5635-
{
5636-
if (ioctls[i].ioctl && _IOC_NR(ioctls[i].ioctl) != i)
5637-
{
5630+
for (i = 0; i < ARRAY_SIZE(ioctls); i++) {
5631+
if (ioctls[i].ioctl && _IOC_NR(ioctls[i].ioctl) != i) {
56385632
DXG_ERR("Invalid ioctl");
56395633
DXGKRNL_ASSERT(0);
56405634
}

0 commit comments

Comments
 (0)