2 files changed, 4 insertions, 21 deletions

diff --git a/arch/cris/arch-v10/drivers/pcf8563.c b/arch/cris/arch-v10/drivers/pcf8563.c
index d47cfbf98d6e..1de0026bb94e 100644
--- a/arch/cris/arch-v10/drivers/pcf8563.c
+++ b/arch/cris/arch-v10/drivers/pcf8563.c
@@ -180,9 +180,7 @@ err:
 void __exit
 pcf8563_exit(void)
 {
-        if (unregister_chrdev(PCF8563_MAJOR, DEVICE_NAME) < 0) {
-                printk(KERN_INFO "%s: Unable to unregister device.\n", PCF8563_NAME);
-        }
+        unregister_chrdev(PCF8563_MAJOR, DEVICE_NAME);
 }
 
 /*
diff --git a/arch/cris/arch-v10/kernel/ptrace.c b/arch/cris/arch-v10/kernel/ptrace.c
index fd2129a04586..f4f9db698b44 100644
--- a/arch/cris/arch-v10/kernel/ptrace.c
+++ b/arch/cris/arch-v10/kernel/ptrace.c
@@ -83,19 +83,9 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
         switch (request) {
                 /* Read word at location address. */ 
                 case PTRACE_PEEKTEXT:
-                case PTRACE_PEEKDATA: {
-                        unsigned long tmp;
-                        int copied;
-
-                        copied = access_process_vm(child, addr, &tmp, sizeof(tmp), 0);
-                        ret = -EIO;
-                        
-                        if (copied != sizeof(tmp))
-                                break;
-                        
-                        ret = put_user(tmp,datap);
+                case PTRACE_PEEKDATA:
+                        ret = generic_ptrace_peekdata(child, addr, data);
                         break;
-                }
 
                 /* Read the word at location address in the USER area. */
                 case PTRACE_PEEKUSR: {
@@ -113,12 +103,7 @@ long arch_ptrace(struct task_struct *child, long request, long addr, long data)
                 /* Write the word at location address. */
                 case PTRACE_POKETEXT:
                 case PTRACE_POKEDATA:
-                        ret = 0;
-                        
-                        if (access_process_vm(child, addr, &data, sizeof(data), 1) == sizeof(data))
-                                break;
-                        
-                        ret = -EIO;
+                        ret = generic_ptrace_pokedata(child, addr, data);
                         break;
  
                 /* Write the word at location address in the USER area. */