diff mbox

[U-Boot] power: pmic.h: Drop include <spi.h>

Message ID 1451981666-28544-1-git-send-email-jteki@openedev.com
State Accepted
Commit 425846ed8f395ca2371bb17226725c062451186d
Delegated to: Jagannadha Sutradharudu Teki
Headers show

Commit Message

Jagan Teki Jan. 5, 2016, 8:14 a.m. UTC
include/power/pmic.h never used any generic spi code
from include/spi.h, but this has been added in below commit.
"dm: pmic: add implementation of driver model pmic uclass"
(sha1: 4d9057e82be11a862db411c4867e859fe0d4ca2a)

Adding functionalities in include/spi.h will trigger a build
issue as this been added used in include/power/pmic.h

Build issue on trats2 with adding BIT macro on spi.h:
----------------------------------------------------
  CC      lib/asm-offsets.s
In file included from include/power/pmic.h:15:0,
                 from include/power/max77686_pmic.h:11,
                 from include/configs/trats2.h:212,
                 from include/config.h:5,
                 from include/common.h:18,
                 from lib/asm-offsets.c:15:
include/spi.h: In function 'spi_w8r8':
include/spi.h:327:2: warning: implicit declaration of function 'BIT' [-Wimplicit-function-declaration]

Cc: Simon Glass <sjg@chromium.org>
Cc: Przemyslaw Marczak <p.marczak@samsung.com>
Reported-by: Tom Rini <trini@konsulko.com>
Signed-off-by: Jagan Teki <jteki@openedev.com>
---
 include/power/pmic.h | 1 -
 1 file changed, 1 deletion(-)

Comments

Tom Rini Jan. 5, 2016, 1:24 p.m. UTC | #1
On Tue, Jan 05, 2016 at 01:44:26PM +0530, Jagan Teki wrote:

> include/power/pmic.h never used any generic spi code
> from include/spi.h, but this has been added in below commit.
> "dm: pmic: add implementation of driver model pmic uclass"
> (sha1: 4d9057e82be11a862db411c4867e859fe0d4ca2a)
> 
> Adding functionalities in include/spi.h will trigger a build
> issue as this been added used in include/power/pmic.h
> 
> Build issue on trats2 with adding BIT macro on spi.h:

Reviewed-by: Tom Rini <trini@konsulko.com>
Simon Glass Jan. 6, 2016, 12:24 a.m. UTC | #2
On 5 January 2016 at 01:14, Jagan Teki <jteki@openedev.com> wrote:
> include/power/pmic.h never used any generic spi code
> from include/spi.h, but this has been added in below commit.
> "dm: pmic: add implementation of driver model pmic uclass"
> (sha1: 4d9057e82be11a862db411c4867e859fe0d4ca2a)
>
> Adding functionalities in include/spi.h will trigger a build
> issue as this been added used in include/power/pmic.h
>
> Build issue on trats2 with adding BIT macro on spi.h:
> ----------------------------------------------------
>   CC      lib/asm-offsets.s
> In file included from include/power/pmic.h:15:0,
>                  from include/power/max77686_pmic.h:11,
>                  from include/configs/trats2.h:212,
>                  from include/config.h:5,
>                  from include/common.h:18,
>                  from lib/asm-offsets.c:15:
> include/spi.h: In function 'spi_w8r8':
> include/spi.h:327:2: warning: implicit declaration of function 'BIT' [-Wimplicit-function-declaration]
>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Przemyslaw Marczak <p.marczak@samsung.com>
> Reported-by: Tom Rini <trini@konsulko.com>
> Signed-off-by: Jagan Teki <jteki@openedev.com>
> ---
>  include/power/pmic.h | 1 -
>  1 file changed, 1 deletion(-)

Acked-by: Simon Glass <sjg@chromium.org>

I suppose we could do i2c.h also?

- Simon
Jagan Teki Jan. 7, 2016, 2:31 p.m. UTC | #3
On 6 January 2016 at 05:54, Simon Glass <sjg@chromium.org> wrote:
> On 5 January 2016 at 01:14, Jagan Teki <jteki@openedev.com> wrote:
>> include/power/pmic.h never used any generic spi code
>> from include/spi.h, but this has been added in below commit.
>> "dm: pmic: add implementation of driver model pmic uclass"
>> (sha1: 4d9057e82be11a862db411c4867e859fe0d4ca2a)
>>
>> Adding functionalities in include/spi.h will trigger a build
>> issue as this been added used in include/power/pmic.h
>>
>> Build issue on trats2 with adding BIT macro on spi.h:
>> ----------------------------------------------------
>>   CC      lib/asm-offsets.s
>> In file included from include/power/pmic.h:15:0,
>>                  from include/power/max77686_pmic.h:11,
>>                  from include/configs/trats2.h:212,
>>                  from include/config.h:5,
>>                  from include/common.h:18,
>>                  from lib/asm-offsets.c:15:
>> include/spi.h: In function 'spi_w8r8':
>> include/spi.h:327:2: warning: implicit declaration of function 'BIT' [-Wimplicit-function-declaration]
>>
>> Cc: Simon Glass <sjg@chromium.org>
>> Cc: Przemyslaw Marczak <p.marczak@samsung.com>
>> Reported-by: Tom Rini <trini@konsulko.com>
>> Signed-off-by: Jagan Teki <jteki@openedev.com>
>> ---
>>  include/power/pmic.h | 1 -
>>  1 file changed, 1 deletion(-)
>
> Acked-by: Simon Glass <sjg@chromium.org>
>
> I suppose we could do i2c.h also?

Tom, I'm taking this as part of u-boot-spi as I have two more fixes -
all + previous PR will send it again, any concerns?

thanks!
Tom Rini Jan. 7, 2016, 2:43 p.m. UTC | #4
On Thu, Jan 07, 2016 at 08:01:29PM +0530, Jagan Teki wrote:
> On 6 January 2016 at 05:54, Simon Glass <sjg@chromium.org> wrote:
> > On 5 January 2016 at 01:14, Jagan Teki <jteki@openedev.com> wrote:
> >> include/power/pmic.h never used any generic spi code
> >> from include/spi.h, but this has been added in below commit.
> >> "dm: pmic: add implementation of driver model pmic uclass"
> >> (sha1: 4d9057e82be11a862db411c4867e859fe0d4ca2a)
> >>
> >> Adding functionalities in include/spi.h will trigger a build
> >> issue as this been added used in include/power/pmic.h
> >>
> >> Build issue on trats2 with adding BIT macro on spi.h:
> >> ----------------------------------------------------
> >>   CC      lib/asm-offsets.s
> >> In file included from include/power/pmic.h:15:0,
> >>                  from include/power/max77686_pmic.h:11,
> >>                  from include/configs/trats2.h:212,
> >>                  from include/config.h:5,
> >>                  from include/common.h:18,
> >>                  from lib/asm-offsets.c:15:
> >> include/spi.h: In function 'spi_w8r8':
> >> include/spi.h:327:2: warning: implicit declaration of function 'BIT' [-Wimplicit-function-declaration]
> >>
> >> Cc: Simon Glass <sjg@chromium.org>
> >> Cc: Przemyslaw Marczak <p.marczak@samsung.com>
> >> Reported-by: Tom Rini <trini@konsulko.com>
> >> Signed-off-by: Jagan Teki <jteki@openedev.com>
> >> ---
> >>  include/power/pmic.h | 1 -
> >>  1 file changed, 1 deletion(-)
> >
> > Acked-by: Simon Glass <sjg@chromium.org>
> >
> > I suppose we could do i2c.h also?
> 
> Tom, I'm taking this as part of u-boot-spi as I have two more fixes -
> all + previous PR will send it again, any concerns?

Yes, it's simply too close to the release to make that level of change.
I'll take the SPI PR with this applied after the release.  If there's
any critical bugfix only things please put them in a new PR.  Thanks!
diff mbox

Patch

diff --git a/include/power/pmic.h b/include/power/pmic.h
index 6ba4b6e..e0b2e12 100644
--- a/include/power/pmic.h
+++ b/include/power/pmic.h
@@ -12,7 +12,6 @@ 
 #define __CORE_PMIC_H_
 
 #include <i2c.h>
-#include <spi.h>
 #include <linux/list.h>
 #include <power/power_chrg.h>