On Thu, Mar 30, 2023 at 05:53:51PM +0900, Damien Le Moal wrote:
> Each of the test functions pci_epf_test_write(), pci_epf_test_read() and
> pci_epf_test_copy() return an int result which is used by
> pci_epf_test_cmd_handler() to set a success or error bit in the request
> status.
>
> In the spirit of keeping the processing of each test case self-contained
> within its own test function, move the request status field update from
> pci_epf_test_cmd_handler() to each of these test functions and change
> these functions declaration to returning void.
>
> Signed-off-by: Damien Le Moal <damien.lemoal@xxxxxxxxxxxxxxxxxx>
Reviewed-by: Manivannan Sadhasivam <mani@xxxxxxxxxx>
- Mani
> ---
> drivers/pci/endpoint/functions/pci-epf-test.c | 46 +++++++++----------
> 1 file changed, 21 insertions(+), 25 deletions(-)
>
> diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c
> index c2a14f828bdf..35bdb03f6ee1 100644
> --- a/drivers/pci/endpoint/functions/pci-epf-test.c
> +++ b/drivers/pci/endpoint/functions/pci-epf-test.c
> @@ -325,8 +325,8 @@ static void pci_epf_test_print_rate(const char *ops, u64 size,
> (u64)ts.tv_sec, (u32)ts.tv_nsec, rate / 1024);
> }
>
> -static int pci_epf_test_copy(struct pci_epf_test *epf_test,
> - struct pci_epf_test_reg *reg)
> +static void pci_epf_test_copy(struct pci_epf_test *epf_test,
> + struct pci_epf_test_reg *reg)
> {
> int ret;
> bool use_dma;
> @@ -420,11 +420,14 @@ static int pci_epf_test_copy(struct pci_epf_test *epf_test,
> pci_epc_mem_free_addr(epc, src_phys_addr, src_addr, reg->size);
>
> err:
> - return ret;
> + if (!ret)
> + reg->status |= STATUS_COPY_SUCCESS;
> + else
> + reg->status |= STATUS_COPY_FAIL;
> }
>
> -static int pci_epf_test_read(struct pci_epf_test *epf_test,
> - struct pci_epf_test_reg *reg)
> +static void pci_epf_test_read(struct pci_epf_test *epf_test,
> + struct pci_epf_test_reg *reg)
> {
> int ret;
> void __iomem *src_addr;
> @@ -509,11 +512,14 @@ static int pci_epf_test_read(struct pci_epf_test *epf_test,
> pci_epc_mem_free_addr(epc, phys_addr, src_addr, reg->size);
>
> err:
> - return ret;
> + if (!ret)
> + reg->status |= STATUS_READ_SUCCESS;
> + else
> + reg->status |= STATUS_READ_FAIL;
> }
>
> -static int pci_epf_test_write(struct pci_epf_test *epf_test,
> - struct pci_epf_test_reg *reg)
> +static void pci_epf_test_write(struct pci_epf_test *epf_test,
> + struct pci_epf_test_reg *reg)
> {
> int ret;
> void __iomem *dst_addr;
> @@ -604,7 +610,10 @@ static int pci_epf_test_write(struct pci_epf_test *epf_test,
> pci_epc_mem_free_addr(epc, phys_addr, dst_addr, reg->size);
>
> err:
> - return ret;
> + if (!ret)
> + reg->status |= STATUS_WRITE_SUCCESS;
> + else
> + reg->status |= STATUS_WRITE_FAIL;
> }
>
> static void pci_epf_test_raise_irq(struct pci_epf_test *epf_test,
> @@ -655,7 +664,6 @@ static void pci_epf_test_raise_irq(struct pci_epf_test *epf_test,
>
> static void pci_epf_test_cmd_handler(struct work_struct *work)
> {
> - int ret;
> u32 command;
> struct pci_epf_test *epf_test = container_of(work, struct pci_epf_test,
> cmd_handler.work);
> @@ -683,27 +691,15 @@ static void pci_epf_test_cmd_handler(struct work_struct *work)
> pci_epf_test_raise_irq(epf_test, reg);
> break;
> case COMMAND_WRITE:
> - ret = pci_epf_test_write(epf_test, reg);
> - if (ret)
> - reg->status |= STATUS_WRITE_FAIL;
> - else
> - reg->status |= STATUS_WRITE_SUCCESS;
> + pci_epf_test_write(epf_test, reg);
> pci_epf_test_raise_irq(epf_test, reg);
> break;
> case COMMAND_READ:
> - ret = pci_epf_test_read(epf_test, reg);
> - if (!ret)
> - reg->status |= STATUS_READ_SUCCESS;
> - else
> - reg->status |= STATUS_READ_FAIL;
> + pci_epf_test_read(epf_test, reg);
> pci_epf_test_raise_irq(epf_test, reg);
> break;
> case COMMAND_COPY:
> - ret = pci_epf_test_copy(epf_test, reg);
> - if (!ret)
> - reg->status |= STATUS_COPY_SUCCESS;
> - else
> - reg->status |= STATUS_COPY_FAIL;
> + pci_epf_test_copy(epf_test, reg);
> pci_epf_test_raise_irq(epf_test, reg);
> break;
> default:
> --
> 2.39.2
>
--
மணிவண்ணன் சதாசிவம்
