[PATCH] err.h: remove deprecated PTR_RET for good

[PATCH] err.h: remove deprecated PTR_RET for good

[Lukas Bulwahn]

Initially, commit fa9ee9c4b988 ("include/linux/err.h: add a function to
cast error-pointers to a return value") from Uwe Kleine-König introduced
PTR_RET in 03/2011. Then, in 07/2013, commit 6e8b8726ad50 ("PTR_RET is
now PTR_ERR_OR_ZERO") from Rusty Russell renamed PTR_RET to
PTR_ERR_OR_ZERO, and left PTR_RET as deprecated-marked alias.

After six years since the renaming and various repeated cleanups in the
meantime, it is time to finally remove the deprecated PTR_RET for good.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
---
Rusty, if you are still around, Acked-by is appreciated.
Uwe, Acked-by is appreciated.
Kudos to Gustavo, Nicholas, Duan & Sachin for previous cleanups.

applies cleanly on current master and on next-20200320
Jiri, please pick this trival patch for the next merge window. Thanks.

 include/linux/err.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/linux/err.h b/include/linux/err.h
index 87be24350e91..a139c64aef2a 100644
--- a/include/linux/err.h
+++ b/include/linux/err.h
@@ -62,9 +62,6 @@ static inline int __must_check PTR_ERR_OR_ZERO(__force const void *ptr)
 		return 0;
 }
 
-/* Deprecated */
-#define PTR_RET(p) PTR_ERR_OR_ZERO(p)
-
 #endif
 
 #endif /* _LINUX_ERR_H */
-- 
2.17.1

Re: [PATCH] err.h: remove deprecated PTR_RET for good

[Jiri Kosina]

On Sun, 22 Mar 2020, Lukas Bulwahn wrote:

> Initially, commit fa9ee9c4b988 ("include/linux/err.h: add a function to
> cast error-pointers to a return value") from Uwe Kleine-König introduced
> PTR_RET in 03/2011. Then, in 07/2013, commit 6e8b8726ad50 ("PTR_RET is
> now PTR_ERR_OR_ZERO") from Rusty Russell renamed PTR_RET to
> PTR_ERR_OR_ZERO, and left PTR_RET as deprecated-marked alias.
> 
> After six years since the renaming and various repeated cleanups in the
> meantime, it is time to finally remove the deprecated PTR_RET for good.
> 
> Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> ---
> Rusty, if you are still around, Acked-by is appreciated.
> Uwe, Acked-by is appreciated.
> Kudos to Gustavo, Nicholas, Duan & Sachin for previous cleanups.
> 
> applies cleanly on current master and on next-20200320
> Jiri, please pick this trival patch for the next merge window. Thanks.

I am queuing it right away; it's been marked deprecated back in 2013, and 
it doesn't have any in-tree users anyway.

Thanks,

-- 
Jiri Kosina
SUSE Labs

Re: [PATCH] err.h: remove deprecated PTR_RET for good

[Uwe Kleine-König]

On Sun, Mar 22, 2020 at 10:42:56PM +0100, Jiri Kosina wrote:
> On Sun, 22 Mar 2020, Lukas Bulwahn wrote:
> 
> > Initially, commit fa9ee9c4b988 ("include/linux/err.h: add a function to
> > cast error-pointers to a return value") from Uwe Kleine-König introduced
> > PTR_RET in 03/2011. Then, in 07/2013, commit 6e8b8726ad50 ("PTR_RET is
> > now PTR_ERR_OR_ZERO") from Rusty Russell renamed PTR_RET to
> > PTR_ERR_OR_ZERO, and left PTR_RET as deprecated-marked alias.
> > 
> > After six years since the renaming and various repeated cleanups in the
> > meantime, it is time to finally remove the deprecated PTR_RET for good.
> > 
> > Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
> > ---
> > Rusty, if you are still around, Acked-by is appreciated.
> > Uwe, Acked-by is appreciated.
> > Kudos to Gustavo, Nicholas, Duan & Sachin for previous cleanups.
> > 
> > applies cleanly on current master and on next-20200320
> > Jiri, please pick this trival patch for the next merge window. Thanks.
> 
> I am queuing it right away; it's been marked deprecated back in 2013, and 
> it doesn't have any in-tree users anyway.

Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>

in case it's not in a tree already that is not supposed to be changed
any more.

Best regards
Uwe

-- 
Pengutronix e.K.                           | Uwe Kleine-König            |
Industrial Linux Solutions                 | https://www.pengutronix.de/ |