On Thu, Mar 14, 2024 at 08:53:43PM +0530, Manivannan Sadhasivam wrote:
> Move the pci_epc_clear_bar() and pci_epf_free_space() code to respective
> helper functions. This allows reusing the helpers in future commits.
>
> This also requires moving the pci_epf_test_unbind() definition below
> pci_epf_test_bind() to avoid forward declaration of the above helpers.
>
> No functional change.
>
> Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@xxxxxxxxxx>
> ---
> drivers/pci/endpoint/functions/pci-epf-test.c | 63 ++++++++++++++++++---------
> 1 file changed, 42 insertions(+), 21 deletions(-)
>
> diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c
> index 1dae0fce8fc4..2fac36553633 100644
> --- a/drivers/pci/endpoint/functions/pci-epf-test.c
> +++ b/drivers/pci/endpoint/functions/pci-epf-test.c
> @@ -686,27 +686,6 @@ static void pci_epf_test_cmd_handler(struct work_struct *work)
> msecs_to_jiffies(1));
> }
>
> -static void pci_epf_test_unbind(struct pci_epf *epf)
> -{
> - struct pci_epf_test *epf_test = epf_get_drvdata(epf);
> - struct pci_epc *epc = epf->epc;
> - struct pci_epf_bar *epf_bar;
> - int bar;
> -
> - cancel_delayed_work(&epf_test->cmd_handler);
> - pci_epf_test_clean_dma_chan(epf_test);
> - for (bar = 0; bar < PCI_STD_NUM_BARS; bar++) {
> - epf_bar = &epf->bar[bar];
> -
> - if (epf_test->reg[bar]) {
> - pci_epc_clear_bar(epc, epf->func_no, epf->vfunc_no,
> - epf_bar);
> - pci_epf_free_space(epf, epf_test->reg[bar], bar,
> - PRIMARY_INTERFACE);
> - }
> - }
> -}
> -
> static int pci_epf_test_set_bar(struct pci_epf *epf)
> {
> int bar, add;
> @@ -746,6 +725,22 @@ static int pci_epf_test_set_bar(struct pci_epf *epf)
> return 0;
> }
>
> +static void pci_epf_test_clear_bar(struct pci_epf *epf)
> +{
> + struct pci_epf_test *epf_test = epf_get_drvdata(epf);
> + struct pci_epc *epc = epf->epc;
> + struct pci_epf_bar *epf_bar;
> + int bar;
> +
> + for (bar = 0; bar < PCI_STD_NUM_BARS; bar++) {
> + epf_bar = &epf->bar[bar];
> +
> + if (epf_test->reg[bar])
> + pci_epc_clear_bar(epc, epf->func_no, epf->vfunc_no,
> + epf_bar);
> + }
> +}
> +
> static int pci_epf_test_epc_init(struct pci_epf *epf)
> {
> struct pci_epf_test *epf_test = epf_get_drvdata(epf);
> @@ -885,6 +880,22 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf)
> return 0;
> }
>
> +static void pci_epf_test_free_space(struct pci_epf *epf)
> +{
> + struct pci_epf_test *epf_test = epf_get_drvdata(epf);
> + struct pci_epf_bar *epf_bar;
> + int bar;
> +
> + for (bar = 0; bar < PCI_STD_NUM_BARS; bar++) {
> + epf_bar = &epf->bar[bar];
> +
> + if (epf_test->reg[bar]) {
> + pci_epf_free_space(epf, epf_test->reg[bar], bar,
> + PRIMARY_INTERFACE);
> + }
Nit: No need for braces here. (Just like you don't have braces in
pci_epf_test_clear_bar()).
Like you said in the other thread, this commit clashes with changes done
in my series.
However, except for the small nit, the commit looks good:
Reviewed-by: Niklas Cassel <cassel@xxxxxxxxxx>
> + }
> +}
> +
> static void pci_epf_configure_bar(struct pci_epf *epf,
> const struct pci_epc_features *epc_features)
> {
> @@ -940,6 +951,16 @@ static int pci_epf_test_bind(struct pci_epf *epf)
> return 0;
> }
>
> +static void pci_epf_test_unbind(struct pci_epf *epf)
> +{
> + struct pci_epf_test *epf_test = epf_get_drvdata(epf);
> +
> + cancel_delayed_work(&epf_test->cmd_handler);
> + pci_epf_test_clean_dma_chan(epf_test);
> + pci_epf_test_clear_bar(epf);
> + pci_epf_test_free_space(epf);
> +}
> +
> static const struct pci_epf_device_id pci_epf_test_ids[] = {
> {
> .name = "pci_epf_test",
>
> --
> 2.25.1
>
