MIME-Version: 1.0
References: <20230316002559.32562-1-kiran.k@intel.com> <20230316002559.32562-2-kiran.k@intel.com>
In-Reply-To: <20230316002559.32562-2-kiran.k@intel.com>
From:   Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Date:   Wed, 15 Mar 2023 22:22:00 -0700
Message-ID: <CABBYNZKbPqR8W8M8gjSdC2C=QL+A8Xs5w9jOzw=Z3O3R6r4jng@mail.gmail.com>
Subject: Re: [PATCH v2 2/2] ACPI: utils: acpi_evaluate_dsm_typed - fix
 redefinition error
To:     Kiran K <kiran.k@intel.com>
Cc:     linux-bluetooth@vger.kernel.org, ravishankar.srivatsa@intel.com,
        chethan.tumkur.narayan@intel.com
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi Kiran,

On Wed, Mar 15, 2023 at 5:32=E2=80=AFPM Kiran K <kiran.k@intel.com> wrote:
>
> acpi_evaluate_dsm_typed function needs to be gaurded with CONFIG_ACPI to
> avoid redefintion error when stub is also enabled.
>
> In file included from ../drivers/bluetooth/btintel.c:13:
> ../include/acpi/acpi_bus.h:57:1: error: redefinition of 'acpi_evaluate_ds=
m_typed'
>    57 | acpi_evaluate_dsm_typed(acpi_handle handle, const guid_t *guid,..
>       | ^~~~~~~~~~~~~~~~~~~~~~~
> In file included from ../drivers/bluetooth/btintel.c:12:
> ../include/linux/acpi.h:967:34: note: previous definition of
> 'acpi_evaluate_dsm_typed' with type 'union acpi_object *(void *,
> const guid_t *, u64,  u64,  union acpi_object *, acpi_object_type)'
> {aka 'union acpi_object *(void *, const guid_t *, long long unsigned int,
> long long unsigned int,  union acpi_object *, unsigned int)'}
>   967 | static inline union acpi_object
> *acpi_evaluate_dsm_typed(acpi_handle handle,
>
> Fixes: 1b94ad7ccc21 ("ACPI: utils: Add acpi_evaluate_dsm_typed() and acpi=
_check_dsm() stubs")

This should probably be sent to the ACPI list/maintainer, but first
make sure there isn't already a fix which would mean we have to update
bluetooth-next to stop this kind of error.

> Signed-off-by: Kiran K <kiran.k@intel.com>
> ---
>
> changes:
> Fix compilation error when compiled for ARCH=3Darc
> Details here:
> https://patchwork.kernel.org/project/bluetooth/patch/20230313151549.15791=
-1-kiran.k@intel.com/
>
>
>  include/acpi/acpi_bus.h | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/include/acpi/acpi_bus.h b/include/acpi/acpi_bus.h
> index e44be31115a6..fc131b4aee4e 100644
> --- a/include/acpi/acpi_bus.h
> +++ b/include/acpi/acpi_bus.h
> @@ -52,7 +52,7 @@ bool acpi_dock_match(acpi_handle handle);
>  bool acpi_check_dsm(acpi_handle handle, const guid_t *guid, u64 rev, u64=
 funcs);
>  union acpi_object *acpi_evaluate_dsm(acpi_handle handle, const guid_t *g=
uid,
>                         u64 rev, u64 func, union acpi_object *argv4);
> -
> +#ifdef CONFIG_ACPI
>  static inline union acpi_object *
>  acpi_evaluate_dsm_typed(acpi_handle handle, const guid_t *guid, u64 rev,
>                         u64 func, union acpi_object *argv4,
> @@ -68,6 +68,7 @@ acpi_evaluate_dsm_typed(acpi_handle handle, const guid_=
t *guid, u64 rev,
>
>         return obj;
>  }
> +#endif
>
>  #define        ACPI_INIT_DSM_ARGV4(cnt, eles)                  \
>         {                                               \
> --
> 2.17.1
>


--=20
Luiz Augusto von Dentz