[PATCH 07/15] power-supply: Rearrange code to remove duplicate lines