diff options
Diffstat (limited to 'drivers/acpi/acpica/utcache.c')
| -rw-r--r-- | drivers/acpi/acpica/utcache.c | 16 | 
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/acpi/acpica/utcache.c b/drivers/acpi/acpica/utcache.c index a877a9647fd..78fde0aac48 100644 --- a/drivers/acpi/acpica/utcache.c +++ b/drivers/acpi/acpica/utcache.c @@ -5,7 +5,7 @@   *****************************************************************************/  /* - * Copyright (C) 2000 - 2013, Intel Corp. + * Copyright (C) 2000 - 2014, Intel Corp.   * All rights reserved.   *   * Redistribution and use in source and binary forms, with or without @@ -65,7 +65,7 @@ ACPI_MODULE_NAME("utcache")  acpi_status  acpi_os_create_cache(char *cache_name,  		     u16 object_size, -		     u16 max_depth, struct acpi_memory_list ** return_cache) +		     u16 max_depth, struct acpi_memory_list **return_cache)  {  	struct acpi_memory_list *cache; @@ -248,12 +248,12 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)  	ACPI_FUNCTION_NAME(os_acquire_object);  	if (!cache) { -		return (NULL); +		return_PTR(NULL);  	}  	status = acpi_ut_acquire_mutex(ACPI_MTX_CACHES);  	if (ACPI_FAILURE(status)) { -		return (NULL); +		return_PTR(NULL);  	}  	ACPI_MEM_TRACKING(cache->requests++); @@ -276,7 +276,7 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)  		status = acpi_ut_release_mutex(ACPI_MTX_CACHES);  		if (ACPI_FAILURE(status)) { -			return (NULL); +			return_PTR(NULL);  		}  		/* Clear (zero) the previously used Object */ @@ -299,15 +299,15 @@ void *acpi_os_acquire_object(struct acpi_memory_list *cache)  		status = acpi_ut_release_mutex(ACPI_MTX_CACHES);  		if (ACPI_FAILURE(status)) { -			return (NULL); +			return_PTR(NULL);  		}  		object = ACPI_ALLOCATE_ZEROED(cache->object_size);  		if (!object) { -			return (NULL); +			return_PTR(NULL);  		}  	} -	return (object); +	return_PTR(object);  }  #endif				/* ACPI_USE_LOCAL_CACHE */  | 
