mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 10:41:38 -04:00
PTR_RET() is a weird name, and led to some confusing usage. We ended
up with PTR_ERR_OR_ZERO(), and replacing or fixing all the usages.
This has been sitting in linux-next for a whole cycle.
Thanks,
Rusty.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAABAgAGBQJSJo+1AAoJENkgDmzRrbjxIC4QALJK95o8AUXuwUkl+2fmFkUt
hh2/PJ1vDYgk4Xt0J6hyoK7XMa0H1RkbBrROuDdsBnorMFpEsGcgdkUZte9ufoAS
97Bg+7N0KPbTB/S8vOwtW1vbERTJIVPN2uf6h1Wqm9Xc2puCh3HbMMr1AWMGu0WQ
NqY5+Zz8zecy1UOrMhEP6H1CjeQcL1w1DO6YM5ydeqlKNzAz+JMfDXriLPDwiE7+
XFPDF/O3Vtd2ckA7L70Lio7hfHwxV5U4WwFVfiwls98XB4jcZqDKIoh1r8z4SRgR
+0Rae2DN3BaOabGMr//5XdrzQVpwJTh5m2w8BAOHJvCJ9HR7Sq29UIN4u+TowZBy
L2xYo4dvFxkympwu5zEd3c7vHYWKIaqmSq5PIjr4gF/uIo2OeOTrpPIK782ZEYb7
e+qUgOEM05V9AmQZCrSZeP9u474Sj8ow3sCtWxfdRtwNfoEIcUXsNNJd/zDHlVtW
cEtXqc2xXIpcuUJQWlSaGp8fmRQjVZPzrLKYLM2m39ZcOOJbf5rzQAYS7hHPosIa
SK+YVux/+Zzi+Xo/vXq1OlM/SruCr5S7JOgCxLowoQ88vupgXME6uPyC8EO+QQ50
GsrHes5ZNLbk0uVsfcexIyojkUnyvDmmnDpv+1zdC6RgZLJQn8OXp5yNhHhnhrFT
BiHX6YFWtDDqRlVv8Q0F
=LeaW
-----END PGP SIGNATURE-----
Merge tag 'PTR_RET-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux
Pull PTR_RET() removal patches from Rusty Russell:
"PTR_RET() is a weird name, and led to some confusing usage. We ended
up with PTR_ERR_OR_ZERO(), and replacing or fixing all the usages.
This has been sitting in linux-next for a whole cycle"
[ There are still some PTR_RET users scattered about, with some of them
possibly being new, but most of them existing in Rusty's tree too. We
have that
#define PTR_RET(p) PTR_ERR_OR_ZERO(p)
thing in <linux/err.h>, so they continue to work for now - Linus ]
* tag 'PTR_RET-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux:
GFS2: Replace PTR_RET with PTR_ERR_OR_ZERO
Btrfs: volume: Replace PTR_RET with PTR_ERR_OR_ZERO
drm/cma: Replace PTR_RET with PTR_ERR_OR_ZERO
sh_veu: Replace PTR_RET with PTR_ERR_OR_ZERO
dma-buf: Replace PTR_RET with PTR_ERR_OR_ZERO
drivers/rtc: Replace PTR_RET with PTR_ERR_OR_ZERO
mm/oom_kill: remove weird use of ERR_PTR()/PTR_ERR().
staging/zcache: don't use PTR_RET().
remoteproc: don't use PTR_RET().
pinctrl: don't use PTR_RET().
acpi: Replace weird use of PTR_RET.
s390: Replace weird use of PTR_RET.
PTR_RET is now PTR_ERR_OR_ZERO(): Replace most.
PTR_RET is now PTR_ERR_OR_ZERO
This commit is contained in:
commit
27703bb4a6
58 changed files with 81 additions and 71 deletions
|
|
@ -250,7 +250,7 @@ static int da9052_rtc_probe(struct platform_device *pdev)
|
|||
|
||||
rtc->rtc = devm_rtc_device_register(&pdev->dev, pdev->name,
|
||||
&da9052_rtc_ops, THIS_MODULE);
|
||||
return PTR_RET(rtc->rtc);
|
||||
return PTR_ERR_OR_ZERO(rtc->rtc);
|
||||
}
|
||||
|
||||
static struct platform_driver da9052_rtc_driver = {
|
||||
|
|
|
|||
|
|
@ -268,7 +268,7 @@ static int isl12022_probe(struct i2c_client *client,
|
|||
isl12022->rtc = devm_rtc_device_register(&client->dev,
|
||||
isl12022_driver.driver.name,
|
||||
&isl12022_rtc_ops, THIS_MODULE);
|
||||
return PTR_RET(isl12022->rtc);
|
||||
return PTR_ERR_OR_ZERO(isl12022->rtc);
|
||||
}
|
||||
|
||||
static const struct i2c_device_id isl12022_id[] = {
|
||||
|
|
|
|||
|
|
@ -175,7 +175,7 @@ static int m48t35_probe(struct platform_device *pdev)
|
|||
|
||||
priv->rtc = devm_rtc_device_register(&pdev->dev, "m48t35",
|
||||
&m48t35_ops, THIS_MODULE);
|
||||
return PTR_RET(priv->rtc);
|
||||
return PTR_ERR_OR_ZERO(priv->rtc);
|
||||
}
|
||||
|
||||
static struct platform_driver m48t35_platform_driver = {
|
||||
|
|
|
|||
|
|
@ -264,7 +264,7 @@ static int pcf8563_probe(struct i2c_client *client,
|
|||
pcf8563_driver.driver.name,
|
||||
&pcf8563_rtc_ops, THIS_MODULE);
|
||||
|
||||
return PTR_RET(pcf8563->rtc);
|
||||
return PTR_ERR_OR_ZERO(pcf8563->rtc);
|
||||
}
|
||||
|
||||
static const struct i2c_device_id pcf8563_id[] = {
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ static int pcf8583_probe(struct i2c_client *client,
|
|||
pcf8583_driver.driver.name,
|
||||
&pcf8583_rtc_ops, THIS_MODULE);
|
||||
|
||||
return PTR_RET(pcf8583->rtc);
|
||||
return PTR_ERR_OR_ZERO(pcf8583->rtc);
|
||||
}
|
||||
|
||||
static const struct i2c_device_id pcf8583_id[] = {
|
||||
|
|
|
|||
Loading…
Reference in a new issue