ich777/linux_media
1
0
Fork 0
mirror of https://github.com/tbsdtv/linux_media.git synced 2025-07-23 20:51:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

staging: axis-fifo: remove unused pointer to memory resource

Browse Source 
Remove unused resource pointer from the device's internal structure.

Signed-off-by: Quentin Deslandes <quentin.deslandes@itdev.co.uk>
Link: https://lore.kernel.org/r/20191101214232.16960-4-quentin.deslandes@itdev.co.uk
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Quentin Deslandes
2019-11-01 21:42:59 +00:00
committed by Greg Kroah-Hartman
parent 6a20d283ed
commit 354e27a86b
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/staging/axis-fifo/axis-fifo.c
View File

@@ -125,7 +125,6 @@ MODULE_PARM_DESC(write_timeout, "ms to wait before blocking write() timing out;
struct axis_fifo { struct axis_fifo {
int irq; /* interrupt */ int irq; /* interrupt */
struct resource *mem; /* physical memory */
void __iomem *base_addr; /* kernel space memory */ void __iomem *base_addr; /* kernel space memory */
unsigned int rx_fifo_depth; /* max words in the receive fifo */ unsigned int rx_fifo_depth; /* max words in the receive fifo */
@@ -806,10 +805,8 @@ static int axis_fifo_probe(struct platform_device *pdev)
goto err_initial; goto err_initial;
} }
fifo->mem = r_mem;
/* request physical memory */ /* request physical memory */
fifo->base_addr = devm_ioremap_resource(fifo->dt_device, fifo->mem); fifo->base_addr = devm_ioremap_resource(fifo->dt_device, r_mem);
if (IS_ERR(fifo->base_addr)) { if (IS_ERR(fifo->base_addr)) {
rc = PTR_ERR(fifo->base_addr); rc = PTR_ERR(fifo->base_addr);
dev_err(fifo->dt_device, "can't remap IO resource (%d)\n", rc); dev_err(fifo->dt_device, "can't remap IO resource (%d)\n", rc);
@@ -820,7 +817,7 @@ static int axis_fifo_probe(struct platform_device *pdev)
/* create unique device name */ /* create unique device name */
snprintf(device_name, sizeof(device_name), "%s_%pa", snprintf(device_name, sizeof(device_name), "%s_%pa",
DRIVER_NAME, &fifo->mem->start); DRIVER_NAME, &r_mem->start);
dev_dbg(fifo->dt_device, "device name [%s]\n", device_name); dev_dbg(fifo->dt_device, "device name [%s]\n", device_name);
@@ -844,7 +841,7 @@ static int axis_fifo_probe(struct platform_device *pdev)
r_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0); r_irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);
if (!r_irq) { if (!r_irq) {
dev_err(fifo->dt_device, "no IRQ found for 0x%pa\n", dev_err(fifo->dt_device, "no IRQ found for 0x%pa\n",
&fifo->mem->start); &r_mem->start);
rc = -EIO; rc = -EIO;
goto err_initial; goto err_initial;
} }
@@ -898,7 +895,7 @@ static int axis_fifo_probe(struct platform_device *pdev)
} }
dev_info(fifo->dt_device, "axis-fifo created at %pa mapped to 0x%pa, irq=%i, major=%i, minor=%i\n", dev_info(fifo->dt_device, "axis-fifo created at %pa mapped to 0x%pa, irq=%i, major=%i, minor=%i\n",
&fifo->mem->start, &fifo->base_addr, fifo->irq, &r_mem->start, &fifo->base_addr, fifo->irq,
MAJOR(fifo->devt), MINOR(fifo->devt)); MAJOR(fifo->devt), MINOR(fifo->devt));
return 0; return 0;