Message ID | 20200505145230.17251-1-aishwaryarj100@gmail.com |
---|---|
State | Accepted |
Headers | show |
Series | i2c: nvidia-gpu: Use PTR_ERR_OR_ZERO() to simplify code | expand |
On Tue, May 05, 2020 at 08:22:30PM +0530, Aishwarya Ramakrishnan wrote: > PTR_ERR_OR_ZERO contains if(IS_ERR(...)) + PTR_ERR. > > Generated by: scripts/coccinelle/api/ptr_ret.cocci > > Signed-off-by: Aishwarya Ramakrishnan <aishwaryarj100@gmail.com> Waiting for the Rev-by from Ajay (driver maintainer). > --- > drivers/i2c/busses/i2c-nvidia-gpu.c | 5 +---- > 1 file changed, 1 insertion(+), 4 deletions(-) > > diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c-nvidia-gpu.c > index f5d25ce00f03..f480105000b8 100644 > --- a/drivers/i2c/busses/i2c-nvidia-gpu.c > +++ b/drivers/i2c/busses/i2c-nvidia-gpu.c > @@ -277,10 +277,7 @@ static int gpu_populate_client(struct gpu_i2c_dev *i2cd, int irq) > i2cd->gpu_ccgx_ucsi->irq = irq; > i2cd->gpu_ccgx_ucsi->properties = ccgx_props; > i2cd->ccgx_client = i2c_new_client_device(&i2cd->adapter, i2cd->gpu_ccgx_ucsi); > - if (IS_ERR(i2cd->ccgx_client)) > - return PTR_ERR(i2cd->ccgx_client); > - > - return 0; > + return PTR_ERR_OR_ZERO(i2cd->ccgx_client); > } > > static int gpu_i2c_probe(struct pci_dev *pdev, const struct pci_device_id *id) > -- > 2.17.1 >
Hi Wolfram, > -----Original Message----- > From: linux-i2c-owner@vger.kernel.org <linux-i2c-owner@vger.kernel.org> On > Behalf Of Wolfram Sang > Sent: Friday, May 22, 2020 8:17 AM > To: Aishwarya Ramakrishnan <aishwaryarj100@gmail.com> > Cc: Ajay Gupta <ajayg@nvidia.com>; linux-i2c@vger.kernel.org; linux- > kernel@vger.kernel.org > Subject: Re: [PATCH] i2c: nvidia-gpu: Use PTR_ERR_OR_ZERO() to simplify > code > > On Tue, May 05, 2020 at 08:22:30PM +0530, Aishwarya Ramakrishnan wrote: > > PTR_ERR_OR_ZERO contains if(IS_ERR(...)) + PTR_ERR. > > > > Generated by: scripts/coccinelle/api/ptr_ret.cocci > > > > Signed-off-by: Aishwarya Ramakrishnan <aishwaryarj100@gmail.com> > > Waiting for the Rev-by from Ajay (driver maintainer). Reviewed-by: Ajay Gupta <ajayg@nvidia.com> Thanks Ajay >nvpublic > > > --- > > drivers/i2c/busses/i2c-nvidia-gpu.c | 5 +---- > > 1 file changed, 1 insertion(+), 4 deletions(-) > > > > diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c- > nvidia-gpu.c > > index f5d25ce00f03..f480105000b8 100644 > > --- a/drivers/i2c/busses/i2c-nvidia-gpu.c > > +++ b/drivers/i2c/busses/i2c-nvidia-gpu.c > > @@ -277,10 +277,7 @@ static int gpu_populate_client(struct gpu_i2c_dev > *i2cd, int irq) > > i2cd->gpu_ccgx_ucsi->irq = irq; > > i2cd->gpu_ccgx_ucsi->properties = ccgx_props; > > i2cd->ccgx_client = i2c_new_client_device(&i2cd->adapter, i2cd- > >gpu_ccgx_ucsi); > > - if (IS_ERR(i2cd->ccgx_client)) > > - return PTR_ERR(i2cd->ccgx_client); > > - > > - return 0; > > + return PTR_ERR_OR_ZERO(i2cd->ccgx_client); > > } > > > > static int gpu_i2c_probe(struct pci_dev *pdev, const struct pci_device_id > *id) > > -- > > 2.17.1 > >
On Tue, May 05, 2020 at 08:22:30PM +0530, Aishwarya Ramakrishnan wrote: > PTR_ERR_OR_ZERO contains if(IS_ERR(...)) + PTR_ERR. > > Generated by: scripts/coccinelle/api/ptr_ret.cocci > > Signed-off-by: Aishwarya Ramakrishnan <aishwaryarj100@gmail.com> Applied to for-next, thanks!
diff --git a/drivers/i2c/busses/i2c-nvidia-gpu.c b/drivers/i2c/busses/i2c-nvidia-gpu.c index f5d25ce00f03..f480105000b8 100644 --- a/drivers/i2c/busses/i2c-nvidia-gpu.c +++ b/drivers/i2c/busses/i2c-nvidia-gpu.c @@ -277,10 +277,7 @@ static int gpu_populate_client(struct gpu_i2c_dev *i2cd, int irq) i2cd->gpu_ccgx_ucsi->irq = irq; i2cd->gpu_ccgx_ucsi->properties = ccgx_props; i2cd->ccgx_client = i2c_new_client_device(&i2cd->adapter, i2cd->gpu_ccgx_ucsi); - if (IS_ERR(i2cd->ccgx_client)) - return PTR_ERR(i2cd->ccgx_client); - - return 0; + return PTR_ERR_OR_ZERO(i2cd->ccgx_client); } static int gpu_i2c_probe(struct pci_dev *pdev, const struct pci_device_id *id)
PTR_ERR_OR_ZERO contains if(IS_ERR(...)) + PTR_ERR. Generated by: scripts/coccinelle/api/ptr_ret.cocci Signed-off-by: Aishwarya Ramakrishnan <aishwaryarj100@gmail.com> --- drivers/i2c/busses/i2c-nvidia-gpu.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)