VisionFive2 Linux kernel

author: Christoph Hellwig <hch@lst.de> 2020-06-17 09:37:53 +0200 committer: Linus Torvalds <torvalds@linux-foundation.org> 2020-06-17 10:57:41 -0700 commit: fe557319aa06c23cffc9346000f119547e0f289a parent: b3a9e3b9622ae10064826dccb4f7a52bd88c7407

Commit Summary:

maccess: rename probe_kernel_{read,write} to copy_{from,to}_kernel_nofault

Diffstat:

1 file changed, 4 insertions, 2 deletions

diff --git a/drivers/dio/dio.c b/drivers/dio/dio.c
index c9aa15fb86a9..193b40e7aec0 100644
--- a/drivers/dio/dio.c
+++ b/drivers/dio/dio.c
@@ -135,7 +135,8 @@ int __init dio_find(int deviceid)
 		else
 			va = ioremap(pa, PAGE_SIZE);
 
-                if (probe_kernel_read(&i, (unsigned char *)va + DIO_IDOFF, 1)) {
+		if (copy_from_kernel_nofault(&i,
+				(unsigned char *)va + DIO_IDOFF, 1)) {
 			if (scode >= DIOII_SCBASE)
 				iounmap(va);
                         continue;             /* no board present at that select code */
@@ -208,7 +209,8 @@ static int __init dio_init(void)
 		else
 			va = ioremap(pa, PAGE_SIZE);
 
-                if (probe_kernel_read(&i, (unsigned char *)va + DIO_IDOFF, 1)) {
+		if (copy_from_kernel_nofault(&i,
+				(unsigned char *)va + DIO_IDOFF, 1)) {
 			if (scode >= DIOII_SCBASE)
 				iounmap(va);
                         continue;              /* no board present at that select code */