2016-10-14 23:21:14

by Hoan Tran

Subject: [PATCH] mailbox: PCC: Fix return value of pcc_mbox_request_channel()

When CONFIG_PCC is disabled, pcc_mbox_request_channel() needs to
return ERR_PTR(-ENODEV), not a NULL pointer, as the callers of
this function use IS_ERR() to check for error code.

Signed-off-by: Duc Dang <[email protected]>
Signed-off-by: Hoan Tran <[email protected]>
---
include/acpi/pcc.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/acpi/pcc.h b/include/acpi/pcc.h
index 17a940a..8caa79c 100644
--- a/include/acpi/pcc.h
+++ b/include/acpi/pcc.h
@@ -21,7 +21,7 @@ extern struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl,
static inline struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl,
int subspace_id)
{
- return NULL;
+ return ERR_PTR(-ENODEV);
}
static inline void pcc_mbox_free_channel(struct mbox_chan *chan) { }
#endif
--
1.9.1

2016-10-21 21:24:23

by Rafael J. Wysocki

Subject: Re: [PATCH] mailbox: PCC: Fix return value of pcc_mbox_request_channel()

On Friday, October 14, 2016 04:20:21 PM Hoan Tran wrote:
> When CONFIG_PCC is disabled, pcc_mbox_request_channel() needs to
> return ERR_PTR(-ENODEV), not a NULL pointer, as the callers of
> this function use IS_ERR() to check for error code.
>
> Signed-off-by: Duc Dang <[email protected]>
> Signed-off-by: Hoan Tran <[email protected]>
> ---
> include/acpi/pcc.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/include/acpi/pcc.h b/include/acpi/pcc.h
> index 17a940a..8caa79c 100644
> --- a/include/acpi/pcc.h
> +++ b/include/acpi/pcc.h
> @@ -21,7 +21,7 @@ extern struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl,
> static inline struct mbox_chan *pcc_mbox_request_channel(struct mbox_client *cl,
> int subspace_id)
> {
> - return NULL;
> + return ERR_PTR(-ENODEV);
> }
> static inline void pcc_mbox_free_channel(struct mbox_chan *chan) { }
> #endif
>

Applied.

Thanks,
Rafael