2013-09-28 04:32:35

by Manish Badarkhe

Subject: [PATCH] tps65090-charger: Use "IS_ENABLED(CONFIG_OF)" for DT code.

Instead of "#if defined(CONFIG_OF)" use "IS_ENABLED(CONFIG_OF)" option
for DT code to avoid if-deffery in code.
Also, arranged header files in alphabetically.

Signed-off-by: Manish Badarkhe <[email protected]>
---
:100644 100644 bdd7b9b... 8b9c406... M drivers/power/tps65090-charger.c
drivers/power/tps65090-charger.c | 19 +++++--------------
1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/drivers/power/tps65090-charger.c b/drivers/power/tps65090-charger.c
index bdd7b9b..8b9c406 100644
--- a/drivers/power/tps65090-charger.c
+++ b/drivers/power/tps65090-charger.c
@@ -15,15 +15,17 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
+#include <linux/delay.h>
#include <linux/err.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/slab.h>
-#include <linux/delay.h>
+#include <linux/of_device.h>
#include <linux/platform_device.h>
#include <linux/power_supply.h>
+#include <linux/slab.h>
+
#include <linux/mfd/tps65090.h>

#define TPS65090_REG_INTR_STS 0x00
@@ -185,10 +187,6 @@ static irqreturn_t tps65090_charger_isr(int irq, void *dev_id)
return IRQ_HANDLED;
}

-#if defined(CONFIG_OF)
-
-#include <linux/of_device.h>
-
static struct tps65090_platform_data *
tps65090_parse_dt_charger_data(struct platform_device *pdev)
{
@@ -210,13 +208,6 @@ static struct tps65090_platform_data *
return pdata;

}
-#else
-static struct tps65090_platform_data *
- tps65090_parse_dt_charger_data(struct platform_device *pdev)
-{
- return NULL;
-}
-#endif

static int tps65090_charger_probe(struct platform_device *pdev)
{
@@ -228,7 +219,7 @@ static int tps65090_charger_probe(struct platform_device *pdev)

pdata = dev_get_platdata(pdev->dev.parent);

- if (!pdata && pdev->dev.of_node)
+ if (IS_ENABLED(CONFIG_OF) && !pdata && pdev->dev.of_node)
pdata = tps65090_parse_dt_charger_data(pdev);

if (!pdata) {
--
1.7.10.4

2013-09-30 16:03:43

by Rhyland Klein

Subject: Re: [PATCH] tps65090-charger: Use "IS_ENABLED(CONFIG_OF)" for DT code.

On 9/28/2013 12:32 AM, Manish Badarkhe wrote:
> Instead of "#if defined(CONFIG_OF)" use "IS_ENABLED(CONFIG_OF)" option
> for DT code to avoid if-deffery in code.
> Also, arranged header files in alphabetically.
>
> Signed-off-by: Manish Badarkhe <[email protected]>
> ---
> :100644 100644 bdd7b9b... 8b9c406... M drivers/power/tps65090-charger.c
> drivers/power/tps65090-charger.c | 19 +++++--------------
> 1 file changed, 5 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/power/tps65090-charger.c b/drivers/power/tps65090-charger.c
> index bdd7b9b..8b9c406 100644
> --- a/drivers/power/tps65090-charger.c
> +++ b/drivers/power/tps65090-charger.c
> @@ -15,15 +15,17 @@
> * You should have received a copy of the GNU General Public License
> * along with this program. If not, see <http://www.gnu.org/licenses/>.
> */
> +#include <linux/delay.h>
> #include <linux/err.h>
> #include <linux/init.h>
> #include <linux/interrupt.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> -#include <linux/slab.h>
> -#include <linux/delay.h>
> +#include <linux/of_device.h>
> #include <linux/platform_device.h>
> #include <linux/power_supply.h>
> +#include <linux/slab.h>
> +
> #include <linux/mfd/tps65090.h>
>
> #define TPS65090_REG_INTR_STS 0x00
> @@ -185,10 +187,6 @@ static irqreturn_t tps65090_charger_isr(int irq, void *dev_id)
> return IRQ_HANDLED;
> }
>
> -#if defined(CONFIG_OF)
> -
> -#include <linux/of_device.h>
> -
> static struct tps65090_platform_data *
> tps65090_parse_dt_charger_data(struct platform_device *pdev)
> {
> @@ -210,13 +208,6 @@ static struct tps65090_platform_data *
> return pdata;
>
> }
> -#else
> -static struct tps65090_platform_data *
> - tps65090_parse_dt_charger_data(struct platform_device *pdev)
> -{
> - return NULL;
> -}
> -#endif
>
> static int tps65090_charger_probe(struct platform_device *pdev)
> {
> @@ -228,7 +219,7 @@ static int tps65090_charger_probe(struct platform_device *pdev)
>
> pdata = dev_get_platdata(pdev->dev.parent);
>
> - if (!pdata && pdev->dev.of_node)
> + if (IS_ENABLED(CONFIG_OF) && !pdata && pdev->dev.of_node)
> pdata = tps65090_parse_dt_charger_data(pdev);
>
> if (!pdata) {
>

LGTM
Acked-by: Rhyland Klein <[email protected]>

--
nvpublic

2013-10-25 23:08:55

by Anton Vorontsov

Subject: Re: [PATCH] tps65090-charger: Use "IS_ENABLED(CONFIG_OF)" for DT code.

On Mon, Sep 30, 2013 at 12:03:40PM -0400, Rhyland Klein wrote:
> On 9/28/2013 12:32 AM, Manish Badarkhe wrote:
> > Instead of "#if defined(CONFIG_OF)" use "IS_ENABLED(CONFIG_OF)" option
> > for DT code to avoid if-deffery in code.
> > Also, arranged header files in alphabetically.
> >
> > Signed-off-by: Manish Badarkhe <[email protected]>
> > ---
> > :100644 100644 bdd7b9b... 8b9c406... M drivers/power/tps65090-charger.c
> > drivers/power/tps65090-charger.c | 19 +++++--------------
> > 1 file changed, 5 insertions(+), 14 deletions(-)
> LGTM
> Acked-by: Rhyland Klein <[email protected]>

Applied, thanks!

Anton