From f2170625b24f6224eec64f591b9360025ccae16f Mon Sep 17 00:00:00 2001 From: Benjamin Romer Date: Tue, 5 Aug 2014 14:57:47 -0400 Subject: [PATCH] staging: unisys: get rid of semaphore macros Remove all of the semaphore macros from timskmod.h and switch all uses of those types to the correct function names. Signed-off-by: Benjamin Romer Signed-off-by: Greg Kroah-Hartman --- drivers/staging/unisys/include/timskmod.h | 28 ---------------------- drivers/staging/unisys/uislib/uislib.c | 16 ++++++------- .../unisys/visorchipset/visorchipset_main.c | 16 ++++++------- 3 files changed, 16 insertions(+), 44 deletions(-) diff --git a/drivers/staging/unisys/include/timskmod.h b/drivers/staging/unisys/include/timskmod.h index 59144ba3c40b..8e0ae45d0f9a 100644 --- a/drivers/staging/unisys/include/timskmod.h +++ b/drivers/staging/unisys/include/timskmod.h @@ -71,34 +71,6 @@ #define HOSTADDRESS unsigned long long #endif -#define LOCKSEM(sem) down_interruptible(sem) -#define LOCKSEM_UNINTERRUPTIBLE(sem) down(sem) -#define UNLOCKSEM(sem) up(sem) - -/** lock read/write semaphore for reading. - Note that all read/write semaphores are of the "uninterruptible" variety. - @param sem (rw_semaphore *) points to semaphore to lock - */ -#define LOCKREADSEM(sem) down_read(sem) - -/** unlock read/write semaphore for reading. - Note that all read/write semaphores are of the "uninterruptible" variety. - @param sem (rw_semaphore *) points to semaphore to unlock - */ -#define UNLOCKREADSEM(sem) up_read(sem) - -/** lock read/write semaphore for writing. - Note that all read/write semaphores are of the "uninterruptible" variety. - @param sem (rw_semaphore *) points to semaphore to lock - */ -#define LOCKWRITESEM(sem) down_write(sem) - -/** unlock read/write semaphore for writing. - Note that all read/write semaphores are of the "uninterruptible" variety. - @param sem (rw_semaphore *) points to semaphore to unlock - */ -#define UNLOCKWRITESEM(sem) up_write(sem) - #ifdef ENABLE_RETURN_TRACE #define RETTRACE(x) \ do { \ diff --git a/drivers/staging/unisys/uislib/uislib.c b/drivers/staging/unisys/uislib/uislib.c index a3a96ad5e617..4cb3487b58df 100644 --- a/drivers/staging/unisys/uislib/uislib.c +++ b/drivers/staging/unisys/uislib/uislib.c @@ -1362,18 +1362,18 @@ Process_Incoming(void *v) struct device_info *dev = NULL; /* poll each channel for input */ - LOCKSEM_UNINTERRUPTIBLE(&Lock_Polling_Device_Channels); + down(&Lock_Polling_Device_Channels); new_tail = NULL; list_for_each_safe(lelt, tmp, &List_Polling_Device_Channels) { int rc = 0; dev = list_entry(lelt, struct device_info, list_polling_device_channels); - LOCKSEM_UNINTERRUPTIBLE(&dev->interrupt_callback_lock); + down(&dev->interrupt_callback_lock); if (dev->interrupt) rc = dev->interrupt(dev->interrupt_context); else continue; - UNLOCKSEM(&dev->interrupt_callback_lock); + up(&dev->interrupt_callback_lock); if (rc) { /* dev->interrupt returned, but there * is still more work to do. @@ -1400,7 +1400,7 @@ Process_Incoming(void *v) tot_moved_to_tail_cnt++; list_move_tail(new_tail, &List_Polling_Device_Channels); } - UNLOCKSEM(&Lock_Polling_Device_Channels); + up(&Lock_Polling_Device_Channels); cur_cycles = get_cycles(); delta_cycles = cur_cycles - old_cycles; old_cycles = cur_cycles; @@ -1470,14 +1470,14 @@ uislib_enable_channel_interrupts(u32 busNo, u32 devNo, (int) (devNo)); return; } - LOCKSEM_UNINTERRUPTIBLE(&Lock_Polling_Device_Channels); + down(&Lock_Polling_Device_Channels); Initialize_incoming_thread(); dev->interrupt = interrupt; dev->interrupt_context = interrupt_context; dev->polling = TRUE; list_add_tail(&(dev->list_polling_device_channels), &List_Polling_Device_Channels); - UNLOCKSEM(&Lock_Polling_Device_Channels); + up(&Lock_Polling_Device_Channels); } EXPORT_SYMBOL_GPL(uislib_enable_channel_interrupts); @@ -1494,11 +1494,11 @@ uislib_disable_channel_interrupts(u32 busNo, u32 devNo) (int) (devNo)); return; } - LOCKSEM_UNINTERRUPTIBLE(&Lock_Polling_Device_Channels); + down(&Lock_Polling_Device_Channels); list_del(&dev->list_polling_device_channels); dev->polling = FALSE; dev->interrupt = NULL; - UNLOCKSEM(&Lock_Polling_Device_Channels); + up(&Lock_Polling_Device_Channels); } EXPORT_SYMBOL_GPL(uislib_disable_channel_interrupts); diff --git a/drivers/staging/unisys/visorchipset/visorchipset_main.c b/drivers/staging/unisys/visorchipset/visorchipset_main.c index fe3c0127d255..e860512f1100 100644 --- a/drivers/staging/unisys/visorchipset/visorchipset_main.c +++ b/drivers/staging/unisys/visorchipset/visorchipset_main.c @@ -594,7 +594,7 @@ visorchipset_register_busdev_server(VISORCHIPSET_BUSDEV_NOTIFIERS *notifiers, VISORCHIPSET_BUSDEV_RESPONDERS *responders, ULTRA_VBUS_DEVICEINFO *driverInfo) { - LOCKSEM_UNINTERRUPTIBLE(&NotifierLock); + down(&NotifierLock); if (notifiers == NULL) { memset(&BusDev_Server_Notifiers, 0, sizeof(BusDev_Server_Notifiers)); @@ -609,7 +609,7 @@ visorchipset_register_busdev_server(VISORCHIPSET_BUSDEV_NOTIFIERS *notifiers, BusDeviceInfo_Init(driverInfo, "chipset", "visorchipset", VERSION, NULL); - UNLOCKSEM(&NotifierLock); + up(&NotifierLock); } EXPORT_SYMBOL_GPL(visorchipset_register_busdev_server); @@ -618,7 +618,7 @@ visorchipset_register_busdev_client(VISORCHIPSET_BUSDEV_NOTIFIERS *notifiers, VISORCHIPSET_BUSDEV_RESPONDERS *responders, ULTRA_VBUS_DEVICEINFO *driverInfo) { - LOCKSEM_UNINTERRUPTIBLE(&NotifierLock); + down(&NotifierLock); if (notifiers == NULL) { memset(&BusDev_Client_Notifiers, 0, sizeof(BusDev_Client_Notifiers)); @@ -632,7 +632,7 @@ visorchipset_register_busdev_client(VISORCHIPSET_BUSDEV_NOTIFIERS *notifiers, if (driverInfo) BusDeviceInfo_Init(driverInfo, "chipset(bolts)", "visorchipset", VERSION, NULL); - UNLOCKSEM(&NotifierLock); + up(&NotifierLock); } EXPORT_SYMBOL_GPL(visorchipset_register_busdev_client); @@ -944,7 +944,7 @@ bus_epilog(u32 busNo, } else pBusInfo->pendingMsgHdr.Id = CONTROLVM_INVALID; - LOCKSEM_UNINTERRUPTIBLE(&NotifierLock); + down(&NotifierLock); if (response == CONTROLVM_RESP_SUCCESS) { switch (cmd) { case CONTROLVM_BUS_CREATE: @@ -989,7 +989,7 @@ bus_epilog(u32 busNo, ; else bus_responder(cmd, busNo, response); - UNLOCKSEM(&NotifierLock); + up(&NotifierLock); } static void @@ -1021,7 +1021,7 @@ device_epilog(u32 busNo, u32 devNo, ULTRA_SEGMENT_STATE state, u32 cmd, } else pDevInfo->pendingMsgHdr.Id = CONTROLVM_INVALID; - LOCKSEM_UNINTERRUPTIBLE(&NotifierLock); + down(&NotifierLock); if (response >= 0) { switch (cmd) { case CONTROLVM_DEVICE_CREATE: @@ -1087,7 +1087,7 @@ device_epilog(u32 busNo, u32 devNo, ULTRA_SEGMENT_STATE state, u32 cmd, ; else device_responder(cmd, busNo, devNo, response); - UNLOCKSEM(&NotifierLock); + up(&NotifierLock); } static void -- 2.11.0