| Message ID | 20240207213922.1796533-4-cassel@kernel.org (mailing list archive) |
|---|---|
| State | Accepted |
| Delegated to: | Manivannan Sadhasivam |
| Headers | show |
| Series | pci_epf_alloc_space() cleanups | expand |
On Wed, Feb 07, 2024 at 10:39:16PM +0100, Niklas Cassel wrote: > Remove superfluous alignment checks, these checks are already done by > pci_epf_alloc_space(). > > Signed-off-by: Niklas Cassel <cassel@kernel.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> - Mani > --- > drivers/pci/endpoint/functions/pci-epf-test.c | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c > index 15bfa7d83489..981894e40681 100644 > --- a/drivers/pci/endpoint/functions/pci-epf-test.c > +++ b/drivers/pci/endpoint/functions/pci-epf-test.c > @@ -841,12 +841,6 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf) > } > test_reg_size = test_reg_bar_size + msix_table_size + pba_size; > > - if (epc_features->bar_fixed_size[test_reg_bar]) { > - if (test_reg_size > bar_size[test_reg_bar]) > - return -ENOMEM; > - test_reg_size = bar_size[test_reg_bar]; > - } > - > base = pci_epf_alloc_space(epf, test_reg_size, test_reg_bar, > epc_features, PRIMARY_INTERFACE); > if (!base) { > @@ -888,8 +882,6 @@ static void pci_epf_configure_bar(struct pci_epf *epf, > bar_fixed_64bit = !!(epc_features->bar_fixed_64bit & (1 << i)); > if (bar_fixed_64bit) > epf_bar->flags |= PCI_BASE_ADDRESS_MEM_TYPE_64; > - if (epc_features->bar_fixed_size[i]) > - bar_size[i] = epc_features->bar_fixed_size[i]; > } > } > > -- > 2.43.0 >
diff --git a/drivers/pci/endpoint/functions/pci-epf-test.c b/drivers/pci/endpoint/functions/pci-epf-test.c index 15bfa7d83489..981894e40681 100644 --- a/drivers/pci/endpoint/functions/pci-epf-test.c +++ b/drivers/pci/endpoint/functions/pci-epf-test.c @@ -841,12 +841,6 @@ static int pci_epf_test_alloc_space(struct pci_epf *epf) } test_reg_size = test_reg_bar_size + msix_table_size + pba_size; - if (epc_features->bar_fixed_size[test_reg_bar]) { - if (test_reg_size > bar_size[test_reg_bar]) - return -ENOMEM; - test_reg_size = bar_size[test_reg_bar]; - } - base = pci_epf_alloc_space(epf, test_reg_size, test_reg_bar, epc_features, PRIMARY_INTERFACE); if (!base) { @@ -888,8 +882,6 @@ static void pci_epf_configure_bar(struct pci_epf *epf, bar_fixed_64bit = !!(epc_features->bar_fixed_64bit & (1 << i)); if (bar_fixed_64bit) epf_bar->flags |= PCI_BASE_ADDRESS_MEM_TYPE_64; - if (epc_features->bar_fixed_size[i]) - bar_size[i] = epc_features->bar_fixed_size[i]; } }
Remove superfluous alignment checks, these checks are already done by pci_epf_alloc_space(). Signed-off-by: Niklas Cassel <cassel@kernel.org> --- drivers/pci/endpoint/functions/pci-epf-test.c | 8 -------- 1 file changed, 8 deletions(-)