@@ -236,9 +236,9 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata)
236
236
cl_data -> in_data = in_data ;
237
237
238
238
for (i = 0 ; i < cl_data -> num_hid_devices ; i ++ ) {
239
- in_data -> sensor_virt_addr [i ] = dma_alloc_coherent (dev , sizeof (int ) * 8 ,
240
- & cl_data -> sensor_dma_addr [i ],
241
- GFP_KERNEL );
239
+ in_data -> sensor_virt_addr [i ] = dmam_alloc_coherent (dev , sizeof (int ) * 8 ,
240
+ & cl_data -> sensor_dma_addr [i ],
241
+ GFP_KERNEL );
242
242
if (!in_data -> sensor_virt_addr [i ]) {
243
243
rc = - ENOMEM ;
244
244
goto cleanup ;
@@ -331,7 +331,6 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata)
331
331
int amd_sfh_hid_client_deinit (struct amd_mp2_dev * privdata )
332
332
{
333
333
struct amdtp_cl_data * cl_data = privdata -> cl_data ;
334
- struct amd_input_data * in_data = cl_data -> in_data ;
335
334
int i , status ;
336
335
337
336
for (i = 0 ; i < cl_data -> num_hid_devices ; i ++ ) {
@@ -351,12 +350,5 @@ int amd_sfh_hid_client_deinit(struct amd_mp2_dev *privdata)
351
350
cancel_delayed_work_sync (& cl_data -> work_buffer );
352
351
amdtp_hid_remove (cl_data );
353
352
354
- for (i = 0 ; i < cl_data -> num_hid_devices ; i ++ ) {
355
- if (in_data -> sensor_virt_addr [i ]) {
356
- dma_free_coherent (& privdata -> pdev -> dev , 8 * sizeof (int ),
357
- in_data -> sensor_virt_addr [i ],
358
- cl_data -> sensor_dma_addr [i ]);
359
- }
360
- }
361
353
return 0 ;
362
354
}
0 commit comments