diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-04-16 17:42:28 +0100 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-16 17:42:28 +0100 | 
| commit | f3c8ec672ed8d3b4c56a20c4e74bf7a7ea0e545d (patch) | |
| tree | 6a409b4ed1ded2a7db797d544d36e6645ce1c793 | |
| parent | 3d21c9452d4d5e17f545848bc4641274cdd6aa26 (diff) | |
| parent | 38aecbb43e47ca82af6ac485207ff6d0b9eeb306 (diff) | |
Merge pull request #893 from antonio-nino-diaz-arm/an/tf-printf-error
Replace tf_printf occurrences with ERROR
| -rw-r--r-- | drivers/arm/cci/cci.c | 9 | 
1 files changed, 4 insertions, 5 deletions
| diff --git a/drivers/arm/cci/cci.c b/drivers/arm/cci/cci.c index 2e773a98..122e6b5f 100644 --- a/drivers/arm/cci/cci.c +++ b/drivers/arm/cci/cci.c @@ -1,5 +1,5 @@  /* - * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved.   *   * Redistribution and use in source and binary forms, with or without   * modification, are permitted provided that the following conditions are met: @@ -54,20 +54,19 @@ static int validate_cci_map(const int *map)  			continue;  		if (slave_if_id >= CCI_SLAVE_INTERFACE_COUNT) { -			tf_printf("Slave interface ID is invalid\n"); +			ERROR("Slave interface ID is invalid\n");  			return 0;  		}  		if (valid_cci_map & (1 << slave_if_id)) { -			tf_printf("Multiple masters are assigned same" -						" slave interface ID\n"); +			ERROR("Multiple masters are assigned same slave interface ID\n");  			return 0;  		}  		valid_cci_map |= 1 << slave_if_id;  	}  	if (!valid_cci_map) { -		tf_printf("No master is assigned a valid slave interface\n"); +		ERROR("No master is assigned a valid slave interface\n");  		return 0;  	} | 
