2022-12-05 23:05:46

by Bjorn Helgaas

Subject: [PATCH] cxl: Remove unnecessary cxl_pci_window_alignment()

From: Bjorn Helgaas <[email protected]>

cxl_pci_window_alignment() is referenced only via the struct
pci_controller_ops.window_alignment function pointer, and only in the
powerpc implementation of pcibios_window_alignment().

pcibios_window_alignment() defaults to returning 1 if the function pointer
is NULL, which is the same was what cxl_pci_window_alignment() does.

cxl_pci_window_alignment() is unnecessary, so remove it. No functional
change intended.

Signed-off-by: Bjorn Helgaas <[email protected]>
---
drivers/misc/cxl/vphb.c | 7 -------
1 file changed, 7 deletions(-)

diff --git a/drivers/misc/cxl/vphb.c b/drivers/misc/cxl/vphb.c
index 1264253cc07b..6332db8044bd 100644
--- a/drivers/misc/cxl/vphb.c
+++ b/drivers/misc/cxl/vphb.c
@@ -67,12 +67,6 @@ static void cxl_pci_disable_device(struct pci_dev *dev)
}
}

-static resource_size_t cxl_pci_window_alignment(struct pci_bus *bus,
- unsigned long type)
-{
- return 1;
-}
-
static void cxl_pci_reset_secondary_bus(struct pci_dev *dev)
{
/* Should we do an AFU reset here ? */
@@ -200,7 +194,6 @@ static struct pci_controller_ops cxl_pci_controller_ops =
.enable_device_hook = cxl_pci_enable_device_hook,
.disable_device = cxl_pci_disable_device,
.release_device = cxl_pci_disable_device,
- .window_alignment = cxl_pci_window_alignment,
.reset_secondary_bus = cxl_pci_reset_secondary_bus,
.setup_msi_irqs = cxl_setup_msi_irqs,
.teardown_msi_irqs = cxl_teardown_msi_irqs,
--
2.25.1

2022-12-06 07:02:18

by Frederic Barrat

Subject: Re: [PATCH] cxl: Remove unnecessary cxl_pci_window_alignment()

On 05/12/2022 23:32, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <[email protected]>
>
> cxl_pci_window_alignment() is referenced only via the struct
> pci_controller_ops.window_alignment function pointer, and only in the
> powerpc implementation of pcibios_window_alignment().
>
> pcibios_window_alignment() defaults to returning 1 if the function pointer
> is NULL, which is the same was what cxl_pci_window_alignment() does.
>
> cxl_pci_window_alignment() is unnecessary, so remove it. No functional
> change intended.
>
> Signed-off-by: Bjorn Helgaas <[email protected]>
> ---


Thanks!
Acked-by: Frederic Barrat <[email protected]>

Fred


> drivers/misc/cxl/vphb.c | 7 -------
> 1 file changed, 7 deletions(-)
>
> diff --git a/drivers/misc/cxl/vphb.c b/drivers/misc/cxl/vphb.c
> index 1264253cc07b..6332db8044bd 100644
> --- a/drivers/misc/cxl/vphb.c
> +++ b/drivers/misc/cxl/vphb.c
> @@ -67,12 +67,6 @@ static void cxl_pci_disable_device(struct pci_dev *dev)
> }
> }
>
> -static resource_size_t cxl_pci_window_alignment(struct pci_bus *bus,
> - unsigned long type)
> -{
> - return 1;
> -}
> -
> static void cxl_pci_reset_secondary_bus(struct pci_dev *dev)
> {
> /* Should we do an AFU reset here ? */
> @@ -200,7 +194,6 @@ static struct pci_controller_ops cxl_pci_controller_ops =
> .enable_device_hook = cxl_pci_enable_device_hook,
> .disable_device = cxl_pci_disable_device,
> .release_device = cxl_pci_disable_device,
> - .window_alignment = cxl_pci_window_alignment,
> .reset_secondary_bus = cxl_pci_reset_secondary_bus,
> .setup_msi_irqs = cxl_setup_msi_irqs,
> .teardown_msi_irqs = cxl_teardown_msi_irqs,

2022-12-08 14:04:04

by Michael Ellerman

Subject: Re: [PATCH] cxl: Remove unnecessary cxl_pci_window_alignment()

On Mon, 5 Dec 2022 16:32:31 -0600, Bjorn Helgaas wrote:
> From: Bjorn Helgaas <[email protected]>
>
> cxl_pci_window_alignment() is referenced only via the struct
> pci_controller_ops.window_alignment function pointer, and only in the
> powerpc implementation of pcibios_window_alignment().
>
> pcibios_window_alignment() defaults to returning 1 if the function pointer
> is NULL, which is the same was what cxl_pci_window_alignment() does.
>
> [...]

Applied to powerpc/next.

[1/1] cxl: Remove unnecessary cxl_pci_window_alignment()
https://git.kernel.org/powerpc/c/6aecc0a59e07ba895b5473e0c916ba5f3d556c15

cheers