mgsuvd: fix coding style

Signed-off-by: Heiko Schocher <hs@denx.de>
This commit is contained in:
Heiko Schocher 2008-10-17 12:15:05 +02:00 committed by Wolfgang Denk
parent 5f4c3137f4
commit cac9cf7875
2 changed files with 33 additions and 44 deletions

View file

@ -20,11 +20,6 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
* MA 02111-1307 USA * MA 02111-1307 USA
*/ */
#if 0
#define DEBUG
#endif
#include <common.h> #include <common.h>
#include <mpc8xx.h> #include <mpc8xx.h>
@ -174,8 +169,7 @@ void ft_blob_update(void *blob, bd_t *bd)
if (ret < 0) if (ret < 0)
printf("ft_blob_update(): cannot set /memory/reg " printf("ft_blob_update(): cannot set /memory/reg "
"property err:%s\n", fdt_strerror (ret)); "property err:%s\n", fdt_strerror (ret));
} } else {
else {
/* memory node is required in dts */ /* memory node is required in dts */
printf("ft_blob_update(): cannot find /memory node " printf("ft_blob_update(): cannot find /memory node "
"err:%s\n", fdt_strerror (nodeoffset)); "err:%s\n", fdt_strerror (nodeoffset));
@ -190,8 +184,7 @@ void ft_blob_update(void *blob, bd_t *bd)
if (ret < 0) if (ret < 0)
printf("ft_blob_update(): cannot set /localbus/ranges " printf("ft_blob_update(): cannot set /localbus/ranges "
"property err:%s\n", fdt_strerror (ret)); "property err:%s\n", fdt_strerror (ret));
} } else {
else {
/* memory node is required in dts */ /* memory node is required in dts */
printf("ft_blob_update(): cannot find /localbus node " printf("ft_blob_update(): cannot find /localbus node "
"err:%s\n", fdt_strerror (nodeoffset)); "err:%s\n", fdt_strerror (nodeoffset));
@ -205,8 +198,7 @@ void ft_blob_update(void *blob, bd_t *bd)
if (ret < 0) if (ret < 0)
printf("ft_blob_update(): cannot set /soc/cpm/brg-frequency " printf("ft_blob_update(): cannot set /soc/cpm/brg-frequency "
"property err:%s\n", fdt_strerror(ret)); "property err:%s\n", fdt_strerror(ret));
} } else {
else {
/* memory node is required in dts */ /* memory node is required in dts */
printf("ft_blob_update(): cannot find /soc/cpm node " printf("ft_blob_update(): cannot find /soc/cpm node "
"err:%s\n", fdt_strerror (nodeoffset)); "err:%s\n", fdt_strerror (nodeoffset));
@ -219,8 +211,7 @@ void ft_blob_update(void *blob, bd_t *bd)
if (ret < 0) if (ret < 0)
printf("ft_blob_update(): cannot set /soc/cpm/scc/mac-address " printf("ft_blob_update(): cannot set /soc/cpm/scc/mac-address "
"property err:%s\n", fdt_strerror (ret)); "property err:%s\n", fdt_strerror (ret));
} } else {
else {
/* memory node is required in dts */ /* memory node is required in dts */
printf("ft_blob_update(): cannot find /soc/cpm/ethernet node " printf("ft_blob_update(): cannot find /soc/cpm/ethernet node "
"err:%s\n", fdt_strerror (nodeoffset)); "err:%s\n", fdt_strerror (nodeoffset));

View file

@ -359,15 +359,13 @@
#define I2C_READ i2c_soft_read_pin () #define I2C_READ i2c_soft_read_pin ()
#define I2C_SDA(bit) if(bit) { \ #define I2C_SDA(bit) if(bit) { \
*(unsigned short *)(I2C_BASE_DIR) &= ~SDA_CONF; \ *(unsigned short *)(I2C_BASE_DIR) &= ~SDA_CONF; \
} \ } else { \
else { \
*(unsigned char *)(I2C_BASE_PORT) &= ~SDA_BIT; \ *(unsigned char *)(I2C_BASE_PORT) &= ~SDA_BIT; \
*(unsigned short *)(I2C_BASE_DIR) |= SDA_CONF; \ *(unsigned short *)(I2C_BASE_DIR) |= SDA_CONF; \
} }
#define I2C_SCL(bit) if(bit) { \ #define I2C_SCL(bit) if(bit) { \
*(unsigned short *)(I2C_BASE_DIR) &= ~SCL_CONF; \ *(unsigned short *)(I2C_BASE_DIR) &= ~SCL_CONF; \
} \ } else { \
else { \
*(unsigned char *)(I2C_BASE_PORT) &= ~SCL_BIT; \ *(unsigned char *)(I2C_BASE_PORT) &= ~SCL_BIT; \
*(unsigned short *)(I2C_BASE_DIR) |= SCL_CONF; \ *(unsigned short *)(I2C_BASE_DIR) |= SCL_CONF; \
} }