aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMattias Wallin <mattias.wallin@stericsson.com>2011-06-08 16:27:21 +0200
committersaid m bagheri <ebgheri@steludxu2848.(none)>2011-06-29 10:30:24 +0200
commite1e530fb0559f09fa1241f933d7c681c0ce79a0e (patch)
tree45d79cc1369c894140fce192a3e3a2960ab6744d
parent175979f8e4d64e7e9d1d4c933659150d048381ef (diff)
power: remove charger from ab8500 struct
The pointer to the charger from the ab8500 struct is no longer needed. ST-Ericsson ID: 256401 ST-Ericsson FOSS-OUT ID: Trivial ST-Ericsson Linux next: NA Signed-off-by: Mattias Wallin <mattias.wallin@stericsson.com> Change-Id: Iec4d4fb69c54366f96283ab1e676a874637550f0 Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/24710 Reviewed-by: Johan PALSSON <johan.palsson@stericsson.com> Reviewed-by: QATOOLS Reviewed-by: QATEST Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
-rw-r--r--drivers/power/ab8500_charger.c1
-rw-r--r--include/linux/mfd/ab8500.h6
2 files changed, 0 insertions, 7 deletions
diff --git a/drivers/power/ab8500_charger.c b/drivers/power/ab8500_charger.c
index 2f9f14d10bb..e9db45494fa 100644
--- a/drivers/power/ab8500_charger.c
+++ b/drivers/power/ab8500_charger.c
@@ -2515,7 +2515,6 @@ static int __devinit ab8500_charger_probe(struct platform_device *pdev)
}
platform_set_drvdata(pdev, di);
- di->parent->charger = di;
return ret;
diff --git a/include/linux/mfd/ab8500.h b/include/linux/mfd/ab8500.h
index 1e2dd01d685..dbf80e51327 100644
--- a/include/linux/mfd/ab8500.h
+++ b/include/linux/mfd/ab8500.h
@@ -138,9 +138,6 @@
#define AB8500_NR_IRQS 112
#define AB8500_NUM_IRQ_REGS 14
-/* Forward declaration */
-struct ab8500_charger;
-
/**
* struct ab8500 - ab8500 internal structure
* @dev: parent device
@@ -154,7 +151,6 @@ struct ab8500_charger;
* @tx_buf: tx buf for SPI
* @mask: cache of IRQ regs for bus lock
* @oldmask: cache of previous IRQ regs for bus lock
- * @charger: pointer to the charger driver device information.
*/
struct ab8500 {
struct device *dev;
@@ -172,8 +168,6 @@ struct ab8500 {
u8 mask[AB8500_NUM_IRQ_REGS];
u8 oldmask[AB8500_NUM_IRQ_REGS];
-
- struct ab8500_charger *charger;
};
struct regulator_reg_init;