kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/gpu/arm/mali400/mali/linux/mali_kernel_linux.c
..
..
@@ -178,11 +178,7 @@
178
178
 
179
179
 static int mali_open(struct inode *inode, struct file *filp);
180
180
 static int mali_release(struct inode *inode, struct file *filp);
181
-#ifdef HAVE_UNLOCKED_IOCTL
182
181
 static long mali_ioctl(struct file *filp, unsigned int cmd, unsigned long arg);
183
-#else
184
-static int mali_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg);
185
-#endif
186
182
 
187
183
 static int mali_probe(struct platform_device *pdev);
188
184
 static int mali_remove(struct platform_device *pdev);
..
..
@@ -276,11 +272,7 @@
276
272
 	.owner = THIS_MODULE,
277
273
 	.open = mali_open,
278
274
 	.release = mali_release,
279
-#ifdef HAVE_UNLOCKED_IOCTL
280
275
 	.unlocked_ioctl = mali_ioctl,
281
-#else
282
-	.ioctl = mali_ioctl,
283
-#endif
284
276
 	.compat_ioctl = mali_ioctl,
285
277
 	.mmap = mali_mmap
286
278
 };
..
..
@@ -940,19 +932,10 @@
940
932
 	}
941
933
 }
942
934
 
943
-#ifdef HAVE_UNLOCKED_IOCTL
944
935
 static long mali_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
945
-#else
946
-static int mali_ioctl(struct inode *inode, struct file *filp, unsigned int cmd, unsigned long arg)
947
-#endif
948
936
 {
949
937
 	int err;
950
938
 	struct mali_session_data *session_data;
951
-
952
-#ifndef HAVE_UNLOCKED_IOCTL
953
-	/* inode not used */
954
-	(void)inode;
955
-#endif
956
939
 
957
940
 	MALI_DEBUG_PRINT(7, ("Ioctl received 0x%08X 0x%08lX\n", cmd, arg));
958
941