iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

media: media/siano: kill pointless kmutex definitions

Browse Source 
Use the mutex api instead of renaming the calls for this
driver.

Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Davidlohr Bueso 2020-11-01 20:54:24 +01:00 committed by Mauro Carvalho Chehab
parent b5fe86307e
commit 73605de01f
3 changed files with 28 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/media/common/siano/smscoreapi.c
View File

@ -429,13 +429,13 @@ static struct smscore_registry_entry_t *smscore_find_registry(char *devpath)
struct smscore_registry_entry_t *entry; struct smscore_registry_entry_t *entry;
struct list_head *next; struct list_head *next;
kmutex_lock(&g_smscore_registrylock); mutex_lock(&g_smscore_registrylock);
for (next = g_smscore_registry.next; for (next = g_smscore_registry.next;
next != &g_smscore_registry; next != &g_smscore_registry;
next = next->next) { next = next->next) {
entry = (struct smscore_registry_entry_t *) next; entry = (struct smscore_registry_entry_t *) next;
if (!strncmp(entry->devpath, devpath, sizeof(entry->devpath))) { if (!strncmp(entry->devpath, devpath, sizeof(entry->devpath))) {
kmutex_unlock(&g_smscore_registrylock); mutex_unlock(&g_smscore_registrylock);
return entry; return entry;
} }
} }
@ -446,7 +446,7 @@ static struct smscore_registry_entry_t *smscore_find_registry(char *devpath)
list_add(&entry->entry, &g_smscore_registry); list_add(&entry->entry, &g_smscore_registry);
} else } else
pr_err("failed to create smscore_registry.\n"); pr_err("failed to create smscore_registry.\n");
kmutex_unlock(&g_smscore_registrylock); mutex_unlock(&g_smscore_registrylock);
return entry; return entry;
} }
@ -527,7 +527,7 @@ int smscore_register_hotplug(hotplug_t hotplug)
struct list_head *next, *first; struct list_head *next, *first;
int rc = 0; int rc = 0;
kmutex_lock(&g_smscore_deviceslock); mutex_lock(&g_smscore_deviceslock);
notifyee = kmalloc(sizeof(*notifyee), GFP_KERNEL); notifyee = kmalloc(sizeof(*notifyee), GFP_KERNEL);
if (notifyee) { if (notifyee) {
/* now notify callback about existing devices */ /* now notify callback about existing devices */
@ -548,7 +548,7 @@ int smscore_register_hotplug(hotplug_t hotplug)
} else } else
rc = -ENOMEM; rc = -ENOMEM;
kmutex_unlock(&g_smscore_deviceslock); mutex_unlock(&g_smscore_deviceslock);
return rc; return rc;
} }
@ -564,7 +564,7 @@ void smscore_unregister_hotplug(hotplug_t hotplug)
{ {
struct list_head *next, *first; struct list_head *next, *first;
kmutex_lock(&g_smscore_deviceslock); mutex_lock(&g_smscore_deviceslock);
first = &g_smscore_notifyees; first = &g_smscore_notifyees;
@ -579,7 +579,7 @@ void smscore_unregister_hotplug(hotplug_t hotplug)
} }
} }
kmutex_unlock(&g_smscore_deviceslock); mutex_unlock(&g_smscore_deviceslock);
} }
EXPORT_SYMBOL_GPL(smscore_unregister_hotplug); 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); smscore_registry_settype(dev->devpath, params->device_type);
/* add device to devices list */ /* add device to devices list */
kmutex_lock(&g_smscore_deviceslock); mutex_lock(&g_smscore_deviceslock);
list_add(&dev->entry, &g_smscore_devices); list_add(&dev->entry, &g_smscore_devices);
kmutex_unlock(&g_smscore_deviceslock); mutex_unlock(&g_smscore_deviceslock);
*coredev = dev; *coredev = dev;
@ -890,14 +890,14 @@ int smscore_start_device(struct smscore_device_t *coredev)
return rc; return rc;
} }
kmutex_lock(&g_smscore_deviceslock); mutex_lock(&g_smscore_deviceslock);
rc = smscore_notify_callbacks(coredev, coredev->device, 1); rc = smscore_notify_callbacks(coredev, coredev->device, 1);
smscore_init_ir(coredev); smscore_init_ir(coredev);
pr_debug("device %p started, rc %d\n", coredev, rc); pr_debug("device %p started, rc %d\n", coredev, rc);
kmutex_unlock(&g_smscore_deviceslock); mutex_unlock(&g_smscore_deviceslock);
return rc; return rc;
} }
@ -1197,7 +1197,7 @@ void smscore_unregister_device(struct smscore_device_t *coredev)
int num_buffers = 0; int num_buffers = 0;
int retry = 0; int retry = 0;
kmutex_lock(&g_smscore_deviceslock); mutex_lock(&g_smscore_deviceslock);
/* Release input device (IR) resources */ /* Release input device (IR) resources */
sms_ir_exit(coredev); 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", pr_debug("waiting for %d buffer(s)\n",
coredev->num_buffers - num_buffers); coredev->num_buffers - num_buffers);
kmutex_unlock(&g_smscore_deviceslock); mutex_unlock(&g_smscore_deviceslock);
msleep(100); msleep(100);
kmutex_lock(&g_smscore_deviceslock); mutex_lock(&g_smscore_deviceslock);
} }
pr_debug("freed %d buffers\n", num_buffers); pr_debug("freed %d buffers\n", num_buffers);
@ -1245,7 +1245,7 @@ void smscore_unregister_device(struct smscore_device_t *coredev)
list_del(&coredev->entry); list_del(&coredev->entry);
kfree(coredev); kfree(coredev);
kmutex_unlock(&g_smscore_deviceslock); mutex_unlock(&g_smscore_deviceslock);
pr_debug("device %p destroyed\n", coredev); pr_debug("device %p destroyed\n", coredev);
} }
@ -2123,17 +2123,17 @@ static int __init smscore_module_init(void)
{ {
INIT_LIST_HEAD(&g_smscore_notifyees); INIT_LIST_HEAD(&g_smscore_notifyees);
INIT_LIST_HEAD(&g_smscore_devices); INIT_LIST_HEAD(&g_smscore_devices);
kmutex_init(&g_smscore_deviceslock); mutex_init(&g_smscore_deviceslock);
INIT_LIST_HEAD(&g_smscore_registry); INIT_LIST_HEAD(&g_smscore_registry);
kmutex_init(&g_smscore_registrylock); mutex_init(&g_smscore_registrylock);
return 0; return 0;
} }
static void __exit smscore_module_exit(void) static void __exit smscore_module_exit(void)
{ {
kmutex_lock(&g_smscore_deviceslock); mutex_lock(&g_smscore_deviceslock);
while (!list_empty(&g_smscore_notifyees)) { while (!list_empty(&g_smscore_notifyees)) {
struct smscore_device_notifyee_t *notifyee = struct smscore_device_notifyee_t *notifyee =
(struct smscore_device_notifyee_t *) (struct smscore_device_notifyee_t *)
@ -2142,9 +2142,9 @@ static void __exit smscore_module_exit(void)
list_del(&notifyee->entry); list_del(&notifyee->entry);
kfree(notifyee); kfree(notifyee);
} }
kmutex_unlock(&g_smscore_deviceslock); mutex_unlock(&g_smscore_deviceslock);
kmutex_lock(&g_smscore_registrylock); mutex_lock(&g_smscore_registrylock);
while (!list_empty(&g_smscore_registry)) { while (!list_empty(&g_smscore_registry)) {
struct smscore_registry_entry_t *entry = struct smscore_registry_entry_t *entry =
(struct smscore_registry_entry_t *) (struct smscore_registry_entry_t *)
@ -2153,7 +2153,7 @@ static void __exit smscore_module_exit(void)
list_del(&entry->entry); list_del(&entry->entry);
kfree(entry); kfree(entry);
} }
kmutex_unlock(&g_smscore_registrylock); mutex_unlock(&g_smscore_registrylock);
pr_debug("\n"); pr_debug("\n");
} }

5
drivers/media/common/siano/smscoreapi.h
View File

@ -28,11 +28,6 @@ Copyright (C) 2006-2008, Uri Shkolnik, Anatoly Greenblat
#include "smsir.h" #include "smsir.h"
#define kmutex_init(_p_) mutex_init(_p_)
#define kmutex_lock(_p_) mutex_lock(_p_)
#define kmutex_trylock(_p_) mutex_trylock(_p_)
#define kmutex_unlock(_p_) mutex_unlock(_p_)
/* /*
* Define the firmware names used by the driver. * Define the firmware names used by the driver.
* Those should match what's used at smscoreapi.c and sms-cards.c * Those should match what's used at smscoreapi.c and sms-cards.c

14
drivers/media/common/siano/smsdvb-main.c
View File

@ -630,11 +630,11 @@ static void smsdvb_unregister_client(struct smsdvb_client_t *client)
static void smsdvb_onremove(void *context) static void smsdvb_onremove(void *context)
{ {
kmutex_lock(&g_smsdvb_clientslock); mutex_lock(&g_smsdvb_clientslock);
smsdvb_unregister_client((struct smsdvb_client_t *) context); smsdvb_unregister_client((struct smsdvb_client_t *) context);
kmutex_unlock(&g_smsdvb_clientslock); mutex_unlock(&g_smsdvb_clientslock);
} }
static int smsdvb_start_feed(struct dvb_demux_feed *feed) static int smsdvb_start_feed(struct dvb_demux_feed *feed)
@ -1151,11 +1151,11 @@ static int smsdvb_hotplug(struct smscore_device_t *coredev,
init_completion(&client->tune_done); init_completion(&client->tune_done);
init_completion(&client->stats_done); init_completion(&client->stats_done);
kmutex_lock(&g_smsdvb_clientslock); mutex_lock(&g_smsdvb_clientslock);
list_add(&client->entry, &g_smsdvb_clients); list_add(&client->entry, &g_smsdvb_clients);
kmutex_unlock(&g_smsdvb_clientslock); mutex_unlock(&g_smsdvb_clientslock);
client->event_fe_state = -1; client->event_fe_state = -1;
client->event_unc_state = -1; client->event_unc_state = -1;
@ -1201,7 +1201,7 @@ static int __init smsdvb_module_init(void)
int rc; int rc;
INIT_LIST_HEAD(&g_smsdvb_clients); INIT_LIST_HEAD(&g_smsdvb_clients);
kmutex_init(&g_smsdvb_clientslock); mutex_init(&g_smsdvb_clientslock);
smsdvb_debugfs_register(); smsdvb_debugfs_register();
@ -1216,14 +1216,14 @@ static void __exit smsdvb_module_exit(void)
{ {
smscore_unregister_hotplug(smsdvb_hotplug); smscore_unregister_hotplug(smsdvb_hotplug);
kmutex_lock(&g_smsdvb_clientslock); mutex_lock(&g_smsdvb_clientslock);
while (!list_empty(&g_smsdvb_clients)) while (!list_empty(&g_smsdvb_clients))
smsdvb_unregister_client((struct smsdvb_client_t *)g_smsdvb_clients.next); smsdvb_unregister_client((struct smsdvb_client_t *)g_smsdvb_clients.next);
smsdvb_debugfs_unregister(); smsdvb_debugfs_unregister();
kmutex_unlock(&g_smsdvb_clientslock); mutex_unlock(&g_smsdvb_clientslock);
} }
module_init(smsdvb_module_init); module_init(smsdvb_module_init);