From 676ac24e07463630281c21af23808728e1b3ae38 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Fri, 1 Aug 2014 08:50:03 -0300 Subject: [PATCH] pmic: pmic_pfuze100: Use a shorter name for PMIC name It is redundant to use 'PFUZE100_PMIC' as the PMIC name because we already know it is a PMIC. Call it simply 'PFUZE100' instead. Cc: Tim Harvey Cc: Markus Niebel Signed-off-by: Fabio Estevam --- board/freescale/mx6sabresd/mx6sabresd.c | 2 +- board/freescale/mx6sxsabresd/mx6sxsabresd.c | 2 +- board/gateworks/gw_ventana/gw_ventana.c | 2 +- board/tqc/tqma6/tqma6.c | 4 ++-- drivers/power/pmic/pmic_pfuze100.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c index d7c4b4f148..80c8ebdafc 100644 --- a/board/freescale/mx6sabresd/mx6sabresd.c +++ b/board/freescale/mx6sabresd/mx6sabresd.c @@ -466,7 +466,7 @@ static int pfuze_init(void) if (ret) return ret; - p = pmic_get("PFUZE100_PMIC"); + p = pmic_get("PFUZE100"); ret = pmic_probe(p); if (ret) return ret; diff --git a/board/freescale/mx6sxsabresd/mx6sxsabresd.c b/board/freescale/mx6sxsabresd/mx6sxsabresd.c index 24d6a5196e..6cd2b4af9f 100644 --- a/board/freescale/mx6sxsabresd/mx6sxsabresd.c +++ b/board/freescale/mx6sxsabresd/mx6sxsabresd.c @@ -90,7 +90,7 @@ static int pfuze_init(void) if (ret) return ret; - p = pmic_get("PFUZE100_PMIC"); + p = pmic_get("PFUZE100"); ret = pmic_probe(p); if (ret) return ret; diff --git a/board/gateworks/gw_ventana/gw_ventana.c b/board/gateworks/gw_ventana/gw_ventana.c index 9967f80d5e..ae1cf8702e 100644 --- a/board/gateworks/gw_ventana/gw_ventana.c +++ b/board/gateworks/gw_ventana/gw_ventana.c @@ -903,7 +903,7 @@ int power_init_board(void) /* configure PFUZE100 PMIC */ if (board_type == GW54xx || board_type == GW54proto) { power_pfuze100_init(I2C_PMIC); - p = pmic_get("PFUZE100_PMIC"); + p = pmic_get("PFUZE100"); if (p && !pmic_probe(p)) { pmic_reg_read(p, PFUZE100_DEVICEID, ®); printf("PMIC: PFUZE100 ID=0x%02x\n", reg); diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c index 69c4551eca..b552bb8d7e 100644 --- a/board/tqc/tqma6/tqma6.c +++ b/board/tqc/tqma6/tqma6.c @@ -229,10 +229,10 @@ int board_late_init(void) * fixed in generic power code */ power_pfuze100_init(TQMA6_PFUZE100_I2C_BUS); - p = pmic_get("PFUZE100_PMIC"); + p = pmic_get("PFUZE100"); if (p && !pmic_probe(p)) { pmic_reg_read(p, PFUZE100_DEVICEID, ®); - printf("PMIC: PFUZE100_PMIC ID=0x%02x\n", reg); + printf("PMIC: PFUZE100 ID=0x%02x\n", reg); } tqma6_bb_board_late_init(); diff --git a/drivers/power/pmic/pmic_pfuze100.c b/drivers/power/pmic/pmic_pfuze100.c index 21f12d2564..22a04c02a3 100644 --- a/drivers/power/pmic/pmic_pfuze100.c +++ b/drivers/power/pmic/pmic_pfuze100.c @@ -13,7 +13,7 @@ int power_pfuze100_init(unsigned char bus) { - static const char name[] = "PFUZE100_PMIC"; + static const char name[] = "PFUZE100"; struct pmic *p = pmic_alloc(); if (!p) {