Re: [PATCH] media/siano: kill pointless kmutex definitions
ping
On Sun, 01 Nov 2020, Davidlohr Bueso wrote:
Use the mutex api instead of renaming the calls for this
driver.
Signed-off-by: Davidlohr Bueso
---
This was found while auditing mutex semantics in drivers.
drivers/media/common/siano/smscoreapi.c | 42
drivers/media/common/siano/smscoreapi.h | 5 ---
drivers/media/common/siano/smsdvb-main.c | 14
3 files changed, 28 insertions(+), 33 deletions(-)
diff --git a/drivers/media/common/siano/smscoreapi.c
b/drivers/media/common/siano/smscoreapi.c
index c1511094fdc7..410cc3ac6f94 100644
--- a/drivers/media/common/siano/smscoreapi.c
+++ b/drivers/media/common/siano/smscoreapi.c
@@ -429,13 +429,13 @@ static struct smscore_registry_entry_t
*smscore_find_registry(char *devpath)
struct smscore_registry_entry_t *entry;
struct list_head *next;
- kmutex_lock(_smscore_registrylock);
+ mutex_lock(_smscore_registrylock);
for (next = g_smscore_registry.next;
next != _smscore_registry;
next = next->next) {
entry = (struct smscore_registry_entry_t *) next;
if (!strncmp(entry->devpath, devpath, sizeof(entry->devpath))) {
- kmutex_unlock(_smscore_registrylock);
+ mutex_unlock(_smscore_registrylock);
return entry;
}
}
@@ -446,7 +446,7 @@ static struct smscore_registry_entry_t
*smscore_find_registry(char *devpath)
list_add(>entry, _smscore_registry);
} else
pr_err("failed to create smscore_registry.\n");
- kmutex_unlock(_smscore_registrylock);
+ mutex_unlock(_smscore_registrylock);
return entry;
}
@@ -527,7 +527,7 @@ int smscore_register_hotplug(hotplug_t hotplug)
struct list_head *next, *first;
int rc = 0;
- kmutex_lock(_smscore_deviceslock);
+ mutex_lock(_smscore_deviceslock);
notifyee = kmalloc(sizeof(*notifyee), GFP_KERNEL);
if (notifyee) {
/* now notify callback about existing devices */
@@ -548,7 +548,7 @@ int smscore_register_hotplug(hotplug_t hotplug)
} else
rc = -ENOMEM;
- kmutex_unlock(_smscore_deviceslock);
+ mutex_unlock(_smscore_deviceslock);
return rc;
}
@@ -564,7 +564,7 @@ void smscore_unregister_hotplug(hotplug_t hotplug)
{
struct list_head *next, *first;
- kmutex_lock(_smscore_deviceslock);
+ mutex_lock(_smscore_deviceslock);
first = _smscore_notifyees;
@@ -579,7 +579,7 @@ void smscore_unregister_hotplug(hotplug_t hotplug)
}
}
- kmutex_unlock(_smscore_deviceslock);
+ mutex_unlock(_smscore_deviceslock);
}
EXPORT_SYMBOL_GPL(smscore_unregister_hotplug);
@@ -732,9 +732,9 @@ int smscore_register_device(struct smsdevice_params_t
*params,
smscore_registry_settype(dev->devpath, params->device_type);
/* add device to devices list */
- kmutex_lock(_smscore_deviceslock);
+ mutex_lock(_smscore_deviceslock);
list_add(>entry, _smscore_devices);
- kmutex_unlock(_smscore_deviceslock);
+ mutex_unlock(_smscore_deviceslock);
*coredev = dev;
@@ -890,14 +890,14 @@ int smscore_start_device(struct smscore_device_t *coredev)
return rc;
}
- kmutex_lock(_smscore_deviceslock);
+ mutex_lock(_smscore_deviceslock);
rc = smscore_notify_callbacks(coredev, coredev->device, 1);
smscore_init_ir(coredev);
pr_debug("device %p started, rc %d\n", coredev, rc);
- kmutex_unlock(_smscore_deviceslock);
+ mutex_unlock(_smscore_deviceslock);
return rc;
}
@@ -1197,7 +1197,7 @@ void smscore_unregister_device(struct smscore_device_t
*coredev)
int num_buffers = 0;
int retry = 0;
- kmutex_lock(_smscore_deviceslock);
+ mutex_lock(_smscore_deviceslock);
/* Release input device (IR) resources */
sms_ir_exit(coredev);
@@ -1224,9 +1224,9 @@ void smscore_unregister_device(struct smscore_device_t
*coredev)
pr_debug("waiting for %d buffer(s)\n",
coredev->num_buffers - num_buffers);
- kmutex_unlock(_smscore_deviceslock);
+ mutex_unlock(_smscore_deviceslock);
msleep(100);
- kmutex_lock(_smscore_deviceslock);
+ mutex_lock(_smscore_deviceslock);
}
pr_debug("freed %d buffers\n", num_buffers);
@@ -1245,7 +1245,7 @@ void smscore_unregister_device(struct smscore_device_t
*coredev)
list_del(>entry);
kfree(coredev);
- kmutex_unlock(_smscore_deviceslock);
+ mutex_unlock(_smscore_deviceslock);
pr_debug("device %p destroyed\n", coredev);
}
@@ -2123,17 +2123,17 @@ static int __init smscore_module_init(void)
{
INIT_LIST_HEAD(_smscore_notifyees);
INIT_LIST_HEAD(_smscore_devices);
-
[PATCH] media/siano: kill pointless kmutex definitions
Use the mutex api instead of renaming the calls for this
driver.
Signed-off-by: Davidlohr Bueso
---
This was found while auditing mutex semantics in drivers.
drivers/media/common/siano/smscoreapi.c | 42
drivers/media/common/siano/smscoreapi.h | 5 ---
drivers/media/common/siano/smsdvb-main.c | 14
3 files changed, 28 insertions(+), 33 deletions(-)
diff --git a/drivers/media/common/siano/smscoreapi.c
b/drivers/media/common/siano/smscoreapi.c
index c1511094fdc7..410cc3ac6f94 100644
--- a/drivers/media/common/siano/smscoreapi.c
+++ b/drivers/media/common/siano/smscoreapi.c
@@ -429,13 +429,13 @@ static struct smscore_registry_entry_t
*smscore_find_registry(char *devpath)
struct smscore_registry_entry_t *entry;
struct list_head *next;
- kmutex_lock(_smscore_registrylock);
+ mutex_lock(_smscore_registrylock);
for (next = g_smscore_registry.next;
next != _smscore_registry;
next = next->next) {
entry = (struct smscore_registry_entry_t *) next;
if (!strncmp(entry->devpath, devpath, sizeof(entry->devpath))) {
- kmutex_unlock(_smscore_registrylock);
+ mutex_unlock(_smscore_registrylock);
return entry;
}
}
@@ -446,7 +446,7 @@ static struct smscore_registry_entry_t
*smscore_find_registry(char *devpath)
list_add(>entry, _smscore_registry);
} else
pr_err("failed to create smscore_registry.\n");
- kmutex_unlock(_smscore_registrylock);
+ mutex_unlock(_smscore_registrylock);
return entry;
}
@@ -527,7 +527,7 @@ int smscore_register_hotplug(hotplug_t hotplug)
struct list_head *next, *first;
int rc = 0;
- kmutex_lock(_smscore_deviceslock);
+ mutex_lock(_smscore_deviceslock);
notifyee = kmalloc(sizeof(*notifyee), GFP_KERNEL);
if (notifyee) {
/* now notify callback about existing devices */
@@ -548,7 +548,7 @@ int smscore_register_hotplug(hotplug_t hotplug)
} else
rc = -ENOMEM;
- kmutex_unlock(_smscore_deviceslock);
+ mutex_unlock(_smscore_deviceslock);
return rc;
}
@@ -564,7 +564,7 @@ void smscore_unregister_hotplug(hotplug_t hotplug)
{
struct list_head *next, *first;
- kmutex_lock(_smscore_deviceslock);
+ mutex_lock(_smscore_deviceslock);
first = _smscore_notifyees;
@@ -579,7 +579,7 @@ void smscore_unregister_hotplug(hotplug_t hotplug)
}
}
- kmutex_unlock(_smscore_deviceslock);
+ mutex_unlock(_smscore_deviceslock);
}
EXPORT_SYMBOL_GPL(smscore_unregister_hotplug);
@@ -732,9 +732,9 @@ int smscore_register_device(struct smsdevice_params_t
*params,
smscore_registry_settype(dev->devpath, params->device_type);
/* add device to devices list */
- kmutex_lock(_smscore_deviceslock);
+ mutex_lock(_smscore_deviceslock);
list_add(>entry, _smscore_devices);
- kmutex_unlock(_smscore_deviceslock);
+ mutex_unlock(_smscore_deviceslock);
*coredev = dev;
@@ -890,14 +890,14 @@ int smscore_start_device(struct smscore_device_t *coredev)
return rc;
}
- kmutex_lock(_smscore_deviceslock);
+ mutex_lock(_smscore_deviceslock);
rc = smscore_notify_callbacks(coredev, coredev->device, 1);
smscore_init_ir(coredev);
pr_debug("device %p started, rc %d\n", coredev, rc);
- kmutex_unlock(_smscore_deviceslock);
+ mutex_unlock(_smscore_deviceslock);
return rc;
}
@@ -1197,7 +1197,7 @@ void smscore_unregister_device(struct smscore_device_t
*coredev)
int num_buffers = 0;
int retry = 0;
- kmutex_lock(_smscore_deviceslock);
+ mutex_lock(_smscore_deviceslock);
/* Release input device (IR) resources */
sms_ir_exit(coredev);
@@ -1224,9 +1224,9 @@ void smscore_unregister_device(struct smscore_device_t
*coredev)
pr_debug("waiting for %d buffer(s)\n",
coredev->num_buffers - num_buffers);
- kmutex_unlock(_smscore_deviceslock);
+ mutex_unlock(_smscore_deviceslock);
msleep(100);
- kmutex_lock(_smscore_deviceslock);
+ mutex_lock(_smscore_deviceslock);
}
pr_debug("freed %d buffers\n", num_buffers);
@@ -1245,7 +1245,7 @@ void smscore_unregister_device(struct smscore_device_t
*coredev)
list_del(>entry);
kfree(coredev);
- kmutex_unlock(_smscore_deviceslock);
+ mutex_unlock(_smscore_deviceslock);
pr_debug("device %p destroyed\n", coredev);
}
@@ -2123,17 +2123,17 @@ static int __init smscore_module_init(void)
{
INIT_LIST_HEAD(_smscore_notifyees);
INIT_LIST_HEAD(_smscore_devices);
- kmutex_init(_smscore_deviceslock);
