microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

[POWERPC] PS3: Vuart: change semaphore to mutex 

A general housekeeping change of the PS3 vuart variable
vuart_bus_priv.probe_mutex from semaphore to mutex.

Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Geoff Levand 2008-01-19 07:32:53 +11:00 коммит произвёл Paul Mackerras
Родитель 781749a46b
Коммит c4e6752dd4
1 изменённых файлов: 11 добавлений и 11 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

22
drivers/ps3/ps3-vuart.c
Просмотреть файл

@ -877,7 +877,7 @@ static int ps3_vuart_handle_port_interrupt(struct ps3_system_bus_device *dev)
struct vuart_bus_priv { struct vuart_bus_priv {
struct ports_bmp *bmp; struct ports_bmp *bmp;
unsigned int virq; unsigned int virq;
struct semaphore probe_mutex; struct mutex probe_mutex;
int use_count; int use_count;
struct ps3_system_bus_device *devices[PORT_COUNT]; struct ps3_system_bus_device *devices[PORT_COUNT];
} static vuart_bus_priv; } static vuart_bus_priv;
@ -1015,7 +1015,7 @@ static int ps3_vuart_probe(struct ps3_system_bus_device *dev)
return -EINVAL; return -EINVAL;
} }
down(&vuart_bus_priv.probe_mutex); mutex_lock(&vuart_bus_priv.probe_mutex);
result = ps3_vuart_bus_interrupt_get(); result = ps3_vuart_bus_interrupt_get();
@ -1075,7 +1075,7 @@ static int ps3_vuart_probe(struct ps3_system_bus_device *dev)
goto fail_probe; goto fail_probe;
} }
up(&vuart_bus_priv.probe_mutex); mutex_unlock(&vuart_bus_priv.probe_mutex);
return result; return result;
@ -1088,7 +1088,7 @@ fail_dev_malloc:
fail_busy: fail_busy:
ps3_vuart_bus_interrupt_put(); ps3_vuart_bus_interrupt_put();
fail_setup_interrupt: fail_setup_interrupt:
up(&vuart_bus_priv.probe_mutex); mutex_unlock(&vuart_bus_priv.probe_mutex);
dev_dbg(&dev->core, "%s:%d: failed\n", __func__, __LINE__); dev_dbg(&dev->core, "%s:%d: failed\n", __func__, __LINE__);
return result; return result;
} }
@ -1127,7 +1127,7 @@ static int ps3_vuart_remove(struct ps3_system_bus_device *dev)
BUG_ON(!dev); BUG_ON(!dev);
down(&vuart_bus_priv.probe_mutex); mutex_lock(&vuart_bus_priv.probe_mutex);
dev_dbg(&dev->core, " -> %s:%d: match_id %d\n", __func__, __LINE__, dev_dbg(&dev->core, " -> %s:%d: match_id %d\n", __func__, __LINE__,
dev->match_id); dev->match_id);
@ -1135,7 +1135,7 @@ static int ps3_vuart_remove(struct ps3_system_bus_device *dev)
if (!dev->core.driver) { if (!dev->core.driver) {
dev_dbg(&dev->core, "%s:%d: no driver bound\n", __func__, dev_dbg(&dev->core, "%s:%d: no driver bound\n", __func__,
__LINE__); __LINE__);
up(&vuart_bus_priv.probe_mutex); mutex_unlock(&vuart_bus_priv.probe_mutex);
return 0; return 0;
} }
@ -1158,7 +1158,7 @@ static int ps3_vuart_remove(struct ps3_system_bus_device *dev)
priv = NULL; priv = NULL;
dev_dbg(&dev->core, " <- %s:%d\n", __func__, __LINE__); dev_dbg(&dev->core, " <- %s:%d\n", __func__, __LINE__);
up(&vuart_bus_priv.probe_mutex); mutex_unlock(&vuart_bus_priv.probe_mutex);
return 0; return 0;
} }
@ -1178,7 +1178,7 @@ static int ps3_vuart_shutdown(struct ps3_system_bus_device *dev)
BUG_ON(!dev); BUG_ON(!dev);
down(&vuart_bus_priv.probe_mutex); mutex_lock(&vuart_bus_priv.probe_mutex);
dev_dbg(&dev->core, " -> %s:%d: match_id %d\n", __func__, __LINE__, dev_dbg(&dev->core, " -> %s:%d: match_id %d\n", __func__, __LINE__,
dev->match_id); dev->match_id);
@ -1186,7 +1186,7 @@ static int ps3_vuart_shutdown(struct ps3_system_bus_device *dev)
if (!dev->core.driver) { if (!dev->core.driver) {
dev_dbg(&dev->core, "%s:%d: no driver bound\n", __func__, dev_dbg(&dev->core, "%s:%d: no driver bound\n", __func__,
__LINE__); __LINE__);
up(&vuart_bus_priv.probe_mutex); mutex_unlock(&vuart_bus_priv.probe_mutex);
return 0; return 0;
} }
@ -1210,7 +1210,7 @@ static int ps3_vuart_shutdown(struct ps3_system_bus_device *dev)
dev_dbg(&dev->core, " <- %s:%d\n", __func__, __LINE__); dev_dbg(&dev->core, " <- %s:%d\n", __func__, __LINE__);
up(&vuart_bus_priv.probe_mutex); mutex_unlock(&vuart_bus_priv.probe_mutex);
return 0; return 0;
} }
@ -1221,7 +1221,7 @@ static int __init ps3_vuart_bus_init(void)
if (!firmware_has_feature(FW_FEATURE_PS3_LV1)) if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
return -ENODEV; return -ENODEV;
init_MUTEX(&vuart_bus_priv.probe_mutex); mutex_init(&vuart_bus_priv.probe_mutex);
return 0; return 0;
} }