2015-02-05 21:18:47

by Pierre Chevalier

Subject: [PATCH] arch: alpha: kernel: remove deprecated call to pci_get_slot

According to Documentation/PCI/pci.txt, pci_get_slot has been
superseded by pci_get_domain_bus_and_slot.

Signed-off-by: Pierre Chevalier <[email protected]>
---
arch/alpha/kernel/sys_miata.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/alpha/kernel/sys_miata.c b/arch/alpha/kernel/sys_miata.c
index d5b9776..7b98b40 100644
--- a/arch/alpha/kernel/sys_miata.c
+++ b/arch/alpha/kernel/sys_miata.c
@@ -182,7 +182,8 @@ miata_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

if((slot == 7) && (PCI_FUNC(dev->devfn) == 3)) {
u8 irq=0;
- struct pci_dev *pdev = pci_get_slot(dev->bus, dev->devfn & ~7);
+ struct pci_dev *pdev =
+ pci_get_domain_bus_and_slot(dev->bus, dev->devfn & ~7);
if(pdev == NULL || pci_read_config_byte(pdev, 0x40,&irq) != PCIBIOS_SUCCESSFUL) {
pci_dev_put(pdev);
return -1;
--
2.2.2

2015-05-21 05:51:36

by Matt Turner

Subject: Re: [PATCH] arch: alpha: kernel: remove deprecated call to pci_get_slot

On Thu, Feb 5, 2015 at 1:17 PM, Pierre Chevalier
<[email protected]> wrote:
> According to Documentation/PCI/pci.txt, pci_get_slot has been
> superseded by pci_get_domain_bus_and_slot.
>
> Signed-off-by: Pierre Chevalier <[email protected]>
> ---
> arch/alpha/kernel/sys_miata.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/arch/alpha/kernel/sys_miata.c b/arch/alpha/kernel/sys_miata.c
> index d5b9776..7b98b40 100644
> --- a/arch/alpha/kernel/sys_miata.c
> +++ b/arch/alpha/kernel/sys_miata.c
> @@ -182,7 +182,8 @@ miata_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
>
> if((slot == 7) && (PCI_FUNC(dev->devfn) == 3)) {
> u8 irq=0;
> - struct pci_dev *pdev = pci_get_slot(dev->bus, dev->devfn & ~7);
> + struct pci_dev *pdev =
> + pci_get_domain_bus_and_slot(dev->bus, dev->devfn & ~7);

Given that pci_get_domain_bus_and_slot takes three arguments, I don't
think this compiles.