2007-08-14 21:42:13

by Adrian Bunk

Subject: [2.6 patch] dvb/bt8xx: "extern inline" -> "static inline"

"extern inline" will have different semantics with gcc 4.3.

Signed-off-by: Adrian Bunk <[email protected]>

---
6ffbe5b19606cd8756be4d04e0902de69e447c85
diff --git a/drivers/media/dvb/bt8xx/bt878.h b/drivers/media/dvb/bt8xx/bt878.h
index f685bc1..1c8e336 100644
--- a/drivers/media/dvb/bt8xx/bt878.h
+++ b/drivers/media/dvb/bt8xx/bt878.h
@@ -149,7 +149,7 @@ void bt878_start(struct bt878 *bt, u32 controlreg, u32 op_sync_orin,
void bt878_stop(struct bt878 *bt);

#if defined(__powerpc__) /* big-endian */
-extern __inline__ void io_st_le32(volatile unsigned __iomem *addr, unsigned val)
+static inline void io_st_le32(volatile unsigned __iomem *addr, unsigned val)
{
__asm__ __volatile__("stwbrx %1,0,%2":"=m"(*addr):"r"(val),
"r"(addr));

2007-08-16 07:17:52

by Manu Abraham

Subject: Re: [v4l-dvb-maintainer] [2.6 patch] dvb/bt8xx: "extern inline" -> "static inline"

Adrian Bunk wrote:
> "extern inline" will have different semantics with gcc 4.3.
>
> Signed-off-by: Adrian Bunk <[email protected]>
>
> ---
> 6ffbe5b19606cd8756be4d04e0902de69e447c85
> diff --git a/drivers/media/dvb/bt8xx/bt878.h b/drivers/media/dvb/bt8xx/bt878.h
> index f685bc1..1c8e336 100644
> --- a/drivers/media/dvb/bt8xx/bt878.h
> +++ b/drivers/media/dvb/bt8xx/bt878.h
> @@ -149,7 +149,7 @@ void bt878_start(struct bt878 *bt, u32 controlreg, u32 op_sync_orin,
> void bt878_stop(struct bt878 *bt);
>
> #if defined(__powerpc__) /* big-endian */
> -extern __inline__ void io_st_le32(volatile unsigned __iomem *addr, unsigned val)
> +static inline void io_st_le32(volatile unsigned __iomem *addr, unsigned val)
> {
> __asm__ __volatile__("stwbrx %1,0,%2":"=m"(*addr):"r"(val),
> "r"(addr));
>
>

Signed-off-by: Manu Abraham <[email protected]>