| Message ID | 20230509145127.33734-2-kheib@redhat.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
| Series | RDMA/iRDMA: Cleanups and improvements | expand |
> Subject: [PATCH 1/3] RDMA/iRDMA: Return void from irdma_init_iw_device() > > The return value from irdma_init_iw_device() is always 0 - change it to be void. > > Signed-off-by: Kamal Heib <kheib@redhat.com> > --- > drivers/infiniband/hw/irdma/verbs.c | 9 ++------- > 1 file changed, 2 insertions(+), 7 deletions(-) > > diff --git a/drivers/infiniband/hw/irdma/verbs.c b/drivers/infiniband/hw/irdma/verbs.c > index ab5cdf782785..b405cc961187 100644 > --- a/drivers/infiniband/hw/irdma/verbs.c > +++ b/drivers/infiniband/hw/irdma/verbs.c > @@ -4515,7 +4515,7 @@ static void irdma_init_roce_device(struct irdma_device > *iwdev) > * irdma_init_iw_device - initialization of iwarp rdma device > * @iwdev: irdma device > */ > -static int irdma_init_iw_device(struct irdma_device *iwdev) > +static void irdma_init_iw_device(struct irdma_device *iwdev) > { > struct net_device *netdev = iwdev->netdev; > > @@ -4533,8 +4533,6 @@ static int irdma_init_iw_device(struct irdma_device > *iwdev) > memcpy(iwdev->ibdev.iw_ifname, netdev->name, > sizeof(iwdev->ibdev.iw_ifname)); > ib_set_device_ops(&iwdev->ibdev, &irdma_iw_dev_ops); > - > - return 0; > } > > /** > @@ -4544,14 +4542,11 @@ static int irdma_init_iw_device(struct irdma_device > *iwdev) static int irdma_init_rdma_device(struct irdma_device *iwdev) { > struct pci_dev *pcidev = iwdev->rf->pcidev; > - int ret; > > if (iwdev->roce_mode) { > irdma_init_roce_device(iwdev); > } else { > - ret = irdma_init_iw_device(iwdev); > - if (ret) > - return ret; > + irdma_init_iw_device(iwdev); > } checkpatch doesn't complain here? This becomes a single statement if/else now. No {} required. > iwdev->ibdev.phys_port_cnt = 1; > iwdev->ibdev.num_comp_vectors = iwdev->rf->ceqs_count; > -- > 2.40.1
On 2023-05-10 10:48, Saleem, Shiraz wrote: >> Subject: [PATCH 1/3] RDMA/iRDMA: Return void from irdma_init_iw_device() >> >> The return value from irdma_init_iw_device() is always 0 - change it to be void. >> >> Signed-off-by: Kamal Heib <kheib@redhat.com> >> --- >> drivers/infiniband/hw/irdma/verbs.c | 9 ++------- >> 1 file changed, 2 insertions(+), 7 deletions(-) >> >> diff --git a/drivers/infiniband/hw/irdma/verbs.c b/drivers/infiniband/hw/irdma/verbs.c >> index ab5cdf782785..b405cc961187 100644 >> --- a/drivers/infiniband/hw/irdma/verbs.c >> +++ b/drivers/infiniband/hw/irdma/verbs.c >> @@ -4515,7 +4515,7 @@ static void irdma_init_roce_device(struct irdma_device >> *iwdev) >> * irdma_init_iw_device - initialization of iwarp rdma device >> * @iwdev: irdma device >> */ >> -static int irdma_init_iw_device(struct irdma_device *iwdev) >> +static void irdma_init_iw_device(struct irdma_device *iwdev) >> { >> struct net_device *netdev = iwdev->netdev; >> >> @@ -4533,8 +4533,6 @@ static int irdma_init_iw_device(struct irdma_device >> *iwdev) >> memcpy(iwdev->ibdev.iw_ifname, netdev->name, >> sizeof(iwdev->ibdev.iw_ifname)); >> ib_set_device_ops(&iwdev->ibdev, &irdma_iw_dev_ops); >> - >> - return 0; >> } >> >> /** >> @@ -4544,14 +4542,11 @@ static int irdma_init_iw_device(struct irdma_device >> *iwdev) static int irdma_init_rdma_device(struct irdma_device *iwdev) { >> struct pci_dev *pcidev = iwdev->rf->pcidev; >> - int ret; >> >> if (iwdev->roce_mode) { >> irdma_init_roce_device(iwdev); >> } else { >> - ret = irdma_init_iw_device(iwdev); >> - if (ret) >> - return ret; >> + irdma_init_iw_device(iwdev); >> } > > checkpatch doesn't complain here? This becomes a single statement if/else now. No {} required. > It complains when running it over the file, fixed in v2. Thanks, Kamal >> iwdev->ibdev.phys_port_cnt = 1; >> iwdev->ibdev.num_comp_vectors = iwdev->rf->ceqs_count; >> -- >> 2.40.1 >
diff --git a/drivers/infiniband/hw/irdma/verbs.c b/drivers/infiniband/hw/irdma/verbs.c index ab5cdf782785..b405cc961187 100644 --- a/drivers/infiniband/hw/irdma/verbs.c +++ b/drivers/infiniband/hw/irdma/verbs.c @@ -4515,7 +4515,7 @@ static void irdma_init_roce_device(struct irdma_device *iwdev) * irdma_init_iw_device - initialization of iwarp rdma device * @iwdev: irdma device */ -static int irdma_init_iw_device(struct irdma_device *iwdev) +static void irdma_init_iw_device(struct irdma_device *iwdev) { struct net_device *netdev = iwdev->netdev; @@ -4533,8 +4533,6 @@ static int irdma_init_iw_device(struct irdma_device *iwdev) memcpy(iwdev->ibdev.iw_ifname, netdev->name, sizeof(iwdev->ibdev.iw_ifname)); ib_set_device_ops(&iwdev->ibdev, &irdma_iw_dev_ops); - - return 0; } /** @@ -4544,14 +4542,11 @@ static int irdma_init_iw_device(struct irdma_device *iwdev) static int irdma_init_rdma_device(struct irdma_device *iwdev) { struct pci_dev *pcidev = iwdev->rf->pcidev; - int ret; if (iwdev->roce_mode) { irdma_init_roce_device(iwdev); } else { - ret = irdma_init_iw_device(iwdev); - if (ret) - return ret; + irdma_init_iw_device(iwdev); } iwdev->ibdev.phys_port_cnt = 1; iwdev->ibdev.num_comp_vectors = iwdev->rf->ceqs_count;
The return value from irdma_init_iw_device() is always 0 - change it to be void. Signed-off-by: Kamal Heib <kheib@redhat.com> --- drivers/infiniband/hw/irdma/verbs.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)