Re: [net-next PATCH v3 1/1] atm: remove deprecated use of pci api
From: Quentin Lambert <hidden>
Date: 2015-01-16 14:10:27
Also in:
lkml
On 16/01/2015 14:57, chas williams - CONTRACTOR wrote:
Signed-off-by: Chas Williams - CONTRACTOR <redacted> --- drivers/atm/eni.c | 33 +++++++------ drivers/atm/fore200e.c | 22 +++++---- drivers/atm/he.c | 125 +++++++++++++++++++++++++----------------------- drivers/atm/he.h | 4 +- drivers/atm/idt77252.c | 107 ++++++++++++++++++++++------------------- drivers/atm/iphase.c | 54 +++++++++++---------- drivers/atm/lanai.c | 14 ++---- drivers/atm/nicstar.c | 60 +++++++++++------------ drivers/atm/solos-pci.c | 26 +++++----- drivers/atm/zatm.c | 17 ++++--- 10 files changed, 243 insertions(+), 219 deletions(-)
[]
quoted hunk ↗ jump to hunk
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c index d5d9eaf..75dde90 100644 --- a/drivers/atm/fore200e.c +++ b/drivers/atm/fore200e.c@@ -425,7 +425,7 @@ static void fore200e_pca_write(u32 val, volatile u32 __iomem *addr) static u32 fore200e_pca_dma_map(struct fore200e* fore200e, void* virt_addr, int size, int direction) { - u32 dma_addr = pci_map_single((struct pci_dev*)fore200e->bus_dev, virt_addr, size, direction); + u32 dma_addr = dma_map_single(&((struct pci_dev *) fore200e->bus_dev)->dev, virt_addr, size, direction); DPRINTK(3, "PCI DVMA mapping: virt_addr = 0x%p, size = %d, direction = %d, --> dma_addr = 0x%08x\n", virt_addr, size, direction, dma_addr);
[] I am going try to make similar changes in some other part of the kernel and I was wondering if you could explain how you decided it wasn't necessary to check for "((struct pci_dev *) fore200e->bus_dev" nullity for instance. Thanks, Quentin