7 files changed, 18 insertions, 54 deletions
diff --git a/c/src/tests/support/stubdr/close.c b/c/src/tests/support/stubdr/close.c
index 7fb24ede56..02cd37f0a8 100644
--- a/c/src/tests/support/stubdr/close.c
+++ b/c/src/tests/support/stubdr/close.c
@@ -6,8 +6,6 @@
  *    major - device major number
  *    minor - device minor number
  *    pargb - pointer to close parameter block
- *    tid   - calling task's id
- *    rval  - address of the return value
  *
  *  Output parameters:
  *    rval       - STUB_SUCCESSFUL
@@ -29,10 +27,8 @@
 rtems_device_driver Stub_close(
   rtems_device_major_number major,
   rtems_device_minor_number minor,
-  void *pargp,
-  rtems_id tid,
-  rtems_unsigned32 *rval
+  void *pargp
 )
 {
-  *rval = STUB_SUCCESSFUL;
+  return STUB_SUCCESSFUL;
 }
diff --git a/c/src/tests/support/stubdr/cntrl.c b/c/src/tests/support/stubdr/cntrl.c
index 8d1d904583..0d21af5f4f 100644
--- a/c/src/tests/support/stubdr/cntrl.c
+++ b/c/src/tests/support/stubdr/cntrl.c
@@ -6,8 +6,6 @@
  *    major - device major number
  *    minor - device minor number
  *    pargp - pointer to cntrl parameter block
- *    tid   - calling task's id
- *    rval  - address of the return value
  *
  *  Output parameters:
  *    rval       - STUB_SUCCESSFUL
@@ -29,10 +27,8 @@
 rtems_device_driver Stub_control(
   rtems_device_major_number major,
   rtems_device_minor_number minor,
-  void *pargp,
-  rtems_id tid,
-  rtems_unsigned32 *rval
+  void *pargp
 )
 {
-  *rval = STUB_SUCCESSFUL;
+  return STUB_SUCCESSFUL;
 }
diff --git a/c/src/tests/support/stubdr/init.c b/c/src/tests/support/stubdr/init.c
index 35ec5f8f37..bf6ee998cf 100644
--- a/c/src/tests/support/stubdr/init.c
+++ b/c/src/tests/support/stubdr/init.c
@@ -6,8 +6,6 @@
  *    major - device major number
  *    minor - device minor number
  *    pargp - pointer to parameter block
- *    tid   - calling task's id
- *    rval  - pointer to return value
  *
  *  Output parameters:
  *    rval       - STUB_SUCCESSFUL
@@ -31,11 +29,9 @@ rtems_unsigned32 STUB_major;
 rtems_device_driver Stub_initialize(
   rtems_device_major_number major,
   rtems_device_minor_number minor,
-  void *pargp,
-  rtems_id tid,
-  rtems_unsigned32 *rval
+  void *pargp
 )
 {
   STUB_major = major;
-  *rval = STUB_SUCCESSFUL;
+  return STUB_SUCCESSFUL;
 }
diff --git a/c/src/tests/support/stubdr/open.c b/c/src/tests/support/stubdr/open.c
index cf4a5c4ffb..01bc414f56 100644
--- a/c/src/tests/support/stubdr/open.c
+++ b/c/src/tests/support/stubdr/open.c
@@ -6,8 +6,6 @@
  *    major - device major number
  *    minor - device minor number
  *    pargb - pointer to open parameter block
- *    tid   - calling task's id
- *    rval  - address of the return value
  *
  *  Output parameters:
  *    rval       - STUB_SUCCESSFUL
@@ -29,10 +27,8 @@
 rtems_device_driver Stub_open(
   rtems_device_major_number major,
   rtems_device_minor_number minor,
-  void *pargp,
-  rtems_id tid,
-  rtems_unsigned32 *rval
+  void *pargp
 )
 {
-  *rval = STUB_SUCCESSFUL;
+  return STUB_SUCCESSFUL;
 }
diff --git a/c/src/tests/support/stubdr/read.c b/c/src/tests/support/stubdr/read.c
index 7244d34cc8..ccf508acf1 100644
--- a/c/src/tests/support/stubdr/read.c
+++ b/c/src/tests/support/stubdr/read.c
@@ -6,8 +6,6 @@
  *    major - device major number
  *    minor - device minor number
  *    pargp - pointer to read parameter block
- *    tid   - calling task's id
- *    rval  - address of the return value
  *
  *  Output parameters:
  *    rval       - STUB_SUCCESSFUL
@@ -29,10 +27,8 @@
 rtems_device_driver Stub_read(
   rtems_device_major_number major,
   rtems_device_minor_number minor,
-  void *pargp,
-  rtems_id tid,
-  rtems_unsigned32 *rval
+  void *pargp
 )
 {
-  *rval = STUB_SUCCESSFUL;
+  return STUB_SUCCESSFUL;
 }
diff --git a/c/src/tests/support/stubdr/stubdrv.h b/c/src/tests/support/stubdr/stubdrv.h
index 34c571b6d6..2ca201c3a8 100644
--- a/c/src/tests/support/stubdr/stubdrv.h
+++ b/c/src/tests/support/stubdr/stubdrv.h
@@ -28,49 +28,37 @@ extern "C" {
 rtems_device_driver Stub_initialize(
   rtems_device_major_number,
   rtems_device_minor_number,
-  void *,
-  rtems_id,
-  rtems_unsigned32 *
+  void *
 );
 
 rtems_device_driver Stub_open(
   rtems_device_major_number,
   rtems_device_minor_number,
-  void *,
-  rtems_id,
-  rtems_unsigned32 *
+  void *
 );
 
 rtems_device_driver Stub_close(
   rtems_device_major_number,
   rtems_device_minor_number,
-  void *,
-  rtems_id,
-  rtems_unsigned32 *
+  void *
 );
 
 rtems_device_driver Stub_read(
   rtems_device_major_number,
   rtems_device_minor_number,
-  void *,
-  rtems_id,
-  rtems_unsigned32 *
+  void *
 );
 
 rtems_device_driver Stub_write(
   rtems_device_major_number,
   rtems_device_minor_number,
-  void *,
-  rtems_id,
-  rtems_unsigned32 *
+  void *
 );
 
 rtems_device_driver Stub_control(
   rtems_device_major_number,
   rtems_device_minor_number,
-  void *,
-  rtems_id,
-  rtems_unsigned32 *
+  void *
 );
 
 #ifdef __cplusplus
diff --git a/c/src/tests/support/stubdr/write.c b/c/src/tests/support/stubdr/write.c
index c6b5ce770a..bc57a2a0cf 100644
--- a/c/src/tests/support/stubdr/write.c
+++ b/c/src/tests/support/stubdr/write.c
@@ -6,8 +6,6 @@
  *    major - device major number
  *    minor - device minor number
  *    pargp - pointer to write parameter block
- *    tid   - calling task's id
- *    rval  - address of the return value
  *
  *  Output parameters:
  *    rval       - STUB_SUCCESSFUL
@@ -29,10 +27,8 @@
 rtems_device_driver Stub_write(
   rtems_device_major_number major,
   rtems_device_minor_number minor,
-  void *pargp,
-  rtems_id tid,
-  rtems_unsigned32 *rval
+  void *pargp
 )
 {
-  *rval = STUB_SUCCESSFUL;
+  return STUB_SUCCESSFUL;
 }