From a0c7b77db3e84cc18dcb2b45efc4cef36aa68433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Fri, 27 Aug 2004 20:58:30 +0000 Subject: [PATCH] Minor cleanup. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@8682 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/bus_managers/scsi/dpc.c | 44 ++++++++++------------ 1 file changed, 19 insertions(+), 25 deletions(-) diff --git a/src/add-ons/kernel/bus_managers/scsi/dpc.c b/src/add-ons/kernel/bus_managers/scsi/dpc.c index 91d953fc35..c6ae926db5 100644 --- a/src/add-ons/kernel/bus_managers/scsi/dpc.c +++ b/src/add-ons/kernel/bus_managers/scsi/dpc.c @@ -1,6 +1,6 @@ /* ** Copyright 2002/03, Thomas Kurschel. All rights reserved. -** Distributed under the terms of the OpenBeOS License. +** Distributed under the terms of the Haiku License. */ /* @@ -21,15 +21,13 @@ status_t scsi_alloc_dpc(scsi_dpc_info **dpc) { - SHOW_FLOW0( 3, "" ); + SHOW_FLOW0(3, ""); - *dpc = (scsi_dpc_info *)malloc( sizeof( **dpc )); - - if( *dpc == NULL ) + *dpc = (scsi_dpc_info *)malloc(sizeof(scsi_dpc_info)); + if (*dpc == NULL) return B_NO_MEMORY; - memset( *dpc, 0, sizeof( **dpc )); - + memset(*dpc, 0, sizeof(scsi_dpc_info)); return B_OK; } @@ -37,37 +35,34 @@ scsi_alloc_dpc(scsi_dpc_info **dpc) status_t scsi_free_dpc(scsi_dpc_info *dpc) { - SHOW_FLOW0( 3, "" ); + SHOW_FLOW0(3, ""); - if( dpc != NULL ) - free( dpc ); - + free(dpc); return B_OK; } status_t scsi_schedule_dpc(scsi_bus_info *bus, scsi_dpc_info *dpc, /*int flags,*/ - void (*func)( void *arg ), void *arg) + void (*func)(void *arg), void *arg) { - SHOW_FLOW( 3, "bus=%p, dpc=%p", bus, dpc ); - acquire_spinlock_irq( &bus->dpc_lock ); - + SHOW_FLOW(3, "bus=%p, dpc=%p", bus, dpc); + acquire_spinlock_irq(&bus->dpc_lock); + dpc->func = func; dpc->arg = arg; - - if( !dpc->registered ) { + + if (!dpc->registered) { dpc->registered = true; dpc->next = bus->dpc_list; bus->dpc_list = dpc; } else - SHOW_FLOW0( 3, "already registered - ignored" ); + SHOW_FLOW0(3, "already registered - ignored"); - release_spinlock_irq( &bus->dpc_lock ); + release_spinlock_irq(&bus->dpc_lock); // this is called in IRQ context, so scheduler is not allowed - release_sem_etc( bus->start_service, 1, B_DO_NOT_RESCHEDULE ); - + release_sem_etc(bus->start_service, 1, B_DO_NOT_RESCHEDULE); return B_OK; } @@ -77,12 +72,12 @@ scsi_schedule_dpc(scsi_bus_info *bus, scsi_dpc_info *dpc, /*int flags,*/ bool scsi_check_exec_dpc(scsi_bus_info *bus) { - SHOW_FLOW( 3, "bus=%p, dpc_list=%p", bus, bus->dpc_list ); + SHOW_FLOW(3, "bus=%p, dpc_list=%p", bus, bus->dpc_list); acquire_spinlock_irq(&bus->dpc_lock); if (bus->dpc_list) { scsi_dpc_info *dpc; - void (*dpc_func)( void * ); + void (*dpc_func)(void *); void *dpc_arg; dpc = bus->dpc_list; @@ -95,11 +90,10 @@ scsi_check_exec_dpc(scsi_bus_info *bus) release_spinlock_irq(&bus->dpc_lock); dpc_func(dpc_arg); - return true; } release_spinlock_irq(&bus->dpc_lock); - return false; } +