Changeset 644 for GPL/branches/uniaud32-next/lib32/soundmidi.c

Timestamp:

Jan 16, 2021, 10:20:04 PM (5 years ago)

Author:

Paul Smedley

Message:

More code cleanups

File:

• GPL/branches/uniaud32-next/lib32/soundmidi.c (modified) (6 diffs)

GPL/branches/uniaud32-next/lib32/soundmidi.c

@@ -120 +120 @@
     {
         //get the client id
-        ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_SEQ_IOCTL_CLIENT_ID, (ULONG)&pHandle->clientid);
+        ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_SEQ_IOCTL_CLIENT_ID, (ULONG)&pHandle->clientid);
         if(ret) {
             rprintf(("Get client id failed with error %d", ret));
@@ -133 +133 @@
             clientinfo.client = i;
             clientinfo.type   = KERNEL_CLIENT;
-            ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_SEQ_IOCTL_GET_CLIENT_INFO, (ULONG)__Stack32ToFlat(&clientinfo));
+            ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_SEQ_IOCTL_GET_CLIENT_INFO, (ULONG)__Stack32ToFlat(&clientinfo));
             if(ret) {
                 continue;
@@ -157 +157 @@
         portinfo.addr.client = pHandle->clientid;
         portinfo.flags       = SNDRV_SEQ_PORT_TYPE_APPLICATION;
-        ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_SEQ_IOCTL_CREATE_PORT, (ULONG)__Stack32ToFlat(&portinfo));
+        ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_SEQ_IOCTL_CREATE_PORT, (ULONG)__Stack32ToFlat(&portinfo));
         if(ret) {
             rprintf(("subscribe error %d", ret));
@@ -172 +172 @@
         subs.sender.client = pHandle->clientid;
         subs.sender.port   = pHandle->clientport;
-        ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_SEQ_IOCTL_SUBSCRIBE_PORT, (ULONG)__Stack32ToFlat(&subs));
+        ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_SEQ_IOCTL_SUBSCRIBE_PORT, (ULONG)__Stack32ToFlat(&subs));
         if(ret) {
             rprintf(("subscribe error %d", ret));
@@ -212 +212 @@
         subs.sender.client = pHandle->clientid;
         subs.sender.port   = pHandle->clientport;
-        ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_SEQ_IOCTL_UNSUBSCRIBE_PORT, (ULONG)__Stack32ToFlat(&subs));
+        ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_SEQ_IOCTL_UNSUBSCRIBE_PORT, (ULONG)__Stack32ToFlat(&subs));
         if(ret) {
             rprintf(("unsubscribe error %d", ret));
@@ -227 +227 @@
         portinfo.addr.client = pHandle->clientid;
         portinfo.addr.port   = pHandle->clientport;
-        ret = pHandle->file.f_op->ioctl(&pHandle->inode, &pHandle->file, SNDRV_SEQ_IOCTL_DELETE_PORT, (ULONG)__Stack32ToFlat(&portinfo));
+        ret = pHandle->file.f_op->unlocked_ioctl(&pHandle->file, SNDRV_SEQ_IOCTL_DELETE_PORT, (ULONG)__Stack32ToFlat(&portinfo));
         if(ret) {
             dprintf(("delete port error %d", ret));