diff options
author | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2014-04-07 23:49:35 (GMT) |
commit | 62b8c978ee6b8d135d9e7953221de58000dba986 (patch) | |
tree | 683b04b2e627f6710c22c151b23c8cc9a165315e /drivers/uio | |
parent | 78fd82238d0e5716578c326404184a27ba67fd6e (diff) | |
download | linux-fsl-qoriq-62b8c978ee6b8d135d9e7953221de58000dba986.tar.xz |
Rewind v3.13-rc3+ (78fd82238d0e5716) to v3.12
Diffstat (limited to 'drivers/uio')
-rw-r--r-- | drivers/uio/uio.c | 40 | ||||
-rw-r--r-- | drivers/uio/uio_aec.c | 1 | ||||
-rw-r--r-- | drivers/uio/uio_cif.c | 1 | ||||
-rw-r--r-- | drivers/uio/uio_mf624.c | 5 | ||||
-rw-r--r-- | drivers/uio/uio_netx.c | 1 | ||||
-rw-r--r-- | drivers/uio/uio_pdrv_genirq.c | 34 | ||||
-rw-r--r-- | drivers/uio/uio_pruss.c | 6 | ||||
-rw-r--r-- | drivers/uio/uio_sercos3.c | 1 |
8 files changed, 55 insertions, 34 deletions
diff --git a/drivers/uio/uio.c b/drivers/uio/uio.c index f7beb6e..0e808cf 100644 --- a/drivers/uio/uio.c +++ b/drivers/uio/uio.c @@ -288,13 +288,13 @@ static int uio_dev_add_attributes(struct uio_device *idev) } map = kzalloc(sizeof(*map), GFP_KERNEL); if (!map) - goto err_map_kobj; + goto err_map; kobject_init(&map->kobj, &map_attr_type); map->mem = mem; mem->map = map; ret = kobject_add(&map->kobj, idev->map_dir, "map%d", mi); if (ret) - goto err_map_kobj; + goto err_map; ret = kobject_uevent(&map->kobj, KOBJ_ADD); if (ret) goto err_map; @@ -313,14 +313,14 @@ static int uio_dev_add_attributes(struct uio_device *idev) } portio = kzalloc(sizeof(*portio), GFP_KERNEL); if (!portio) - goto err_portio_kobj; + goto err_portio; kobject_init(&portio->kobj, &portio_attr_type); portio->port = port; port->portio = portio; ret = kobject_add(&portio->kobj, idev->portio_dir, "port%d", pi); if (ret) - goto err_portio_kobj; + goto err_portio; ret = kobject_uevent(&portio->kobj, KOBJ_ADD); if (ret) goto err_portio; @@ -329,18 +329,14 @@ static int uio_dev_add_attributes(struct uio_device *idev) return 0; err_portio: - pi--; -err_portio_kobj: - for (; pi >= 0; pi--) { + for (pi--; pi >= 0; pi--) { port = &idev->info->port[pi]; portio = port->portio; kobject_put(&portio->kobj); } kobject_put(idev->portio_dir); err_map: - mi--; -err_map_kobj: - for (; mi >= 0; mi--) { + for (mi--; mi>=0; mi--) { mem = &idev->info->mem[mi]; map = mem->map; kobject_put(&map->kobj); @@ -605,7 +601,6 @@ static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf) struct uio_device *idev = vma->vm_private_data; struct page *page; unsigned long offset; - void *addr; int mi = uio_find_mem_index(vma); if (mi < 0) @@ -617,11 +612,10 @@ static int uio_vma_fault(struct vm_area_struct *vma, struct vm_fault *vmf) */ offset = (vmf->pgoff - mi) << PAGE_SHIFT; - addr = (void *)(unsigned long)idev->info->mem[mi].addr + offset; if (idev->info->mem[mi].memtype == UIO_MEM_LOGICAL) - page = virt_to_page(addr); + page = virt_to_page(idev->info->mem[mi].addr + offset); else - page = vmalloc_to_page(addr); + page = vmalloc_to_page((void *)(unsigned long)idev->info->mem[mi].addr + offset); get_page(page); vmf->page = page; return 0; @@ -653,8 +647,6 @@ static int uio_mmap_physical(struct vm_area_struct *vma) return -EINVAL; mem = idev->info->mem + mi; - if (mem->addr & ~PAGE_MASK) - return -ENODEV; if (vma->vm_end - vma->vm_start > mem->size) return -EINVAL; @@ -817,9 +809,10 @@ int __uio_register_device(struct module *owner, info->uio_dev = NULL; - idev = devm_kzalloc(parent, sizeof(*idev), GFP_KERNEL); + idev = kzalloc(sizeof(*idev), GFP_KERNEL); if (!idev) { - return -ENOMEM; + ret = -ENOMEM; + goto err_kzalloc; } idev->owner = owner; @@ -829,7 +822,7 @@ int __uio_register_device(struct module *owner, ret = uio_get_minor(idev); if (ret) - return ret; + goto err_get_minor; idev->dev = device_create(&uio_class, parent, MKDEV(uio_major, idev->minor), idev, @@ -847,7 +840,7 @@ int __uio_register_device(struct module *owner, info->uio_dev = idev; if (info->irq && (info->irq != UIO_IRQ_CUSTOM)) { - ret = devm_request_irq(parent, info->irq, uio_interrupt, + ret = request_irq(info->irq, uio_interrupt, info->irq_flags, info->name, idev); if (ret) goto err_request_irq; @@ -861,6 +854,9 @@ err_uio_dev_add_attributes: device_destroy(&uio_class, MKDEV(uio_major, idev->minor)); err_device_create: uio_free_minor(idev); +err_get_minor: + kfree(idev); +err_kzalloc: return ret; } EXPORT_SYMBOL_GPL(__uio_register_device); @@ -881,9 +877,13 @@ void uio_unregister_device(struct uio_info *info) uio_free_minor(idev); + if (info->irq && (info->irq != UIO_IRQ_CUSTOM)) + free_irq(info->irq, idev); + uio_dev_del_attributes(idev); device_destroy(&uio_class, MKDEV(uio_major, idev->minor)); + kfree(idev); return; } diff --git a/drivers/uio/uio_aec.c b/drivers/uio/uio_aec.c index 1549fab..f3611c2 100644 --- a/drivers/uio/uio_aec.c +++ b/drivers/uio/uio_aec.c @@ -147,6 +147,7 @@ static void remove(struct pci_dev *pdev) uio_unregister_device(info); pci_release_regions(pdev); pci_disable_device(pdev); + pci_set_drvdata(pdev, NULL); iounmap(info->priv); kfree(info); diff --git a/drivers/uio/uio_cif.c b/drivers/uio/uio_cif.c index 30f533c..22cdf38 100644 --- a/drivers/uio/uio_cif.c +++ b/drivers/uio/uio_cif.c @@ -106,6 +106,7 @@ static void hilscher_pci_remove(struct pci_dev *dev) uio_unregister_device(info); pci_release_regions(dev); pci_disable_device(dev); + pci_set_drvdata(dev, NULL); iounmap(info->mem[0].internal_addr); kfree (info); diff --git a/drivers/uio/uio_mf624.c b/drivers/uio/uio_mf624.c index f764adb..a1768b2 100644 --- a/drivers/uio/uio_mf624.c +++ b/drivers/uio/uio_mf624.c @@ -42,7 +42,7 @@ enum mf624_interrupt_source {ADC, CTR4, ALL}; -static void mf624_disable_interrupt(enum mf624_interrupt_source source, +void mf624_disable_interrupt(enum mf624_interrupt_source source, struct uio_info *info) { void __iomem *INTCSR_reg = info->mem[0].internal_addr + INTCSR; @@ -70,7 +70,7 @@ static void mf624_disable_interrupt(enum mf624_interrupt_source source, } } -static void mf624_enable_interrupt(enum mf624_interrupt_source source, +void mf624_enable_interrupt(enum mf624_interrupt_source source, struct uio_info *info) { void __iomem *INTCSR_reg = info->mem[0].internal_addr + INTCSR; @@ -220,6 +220,7 @@ static void mf624_pci_remove(struct pci_dev *dev) uio_unregister_device(info); pci_release_regions(dev); pci_disable_device(dev); + pci_set_drvdata(dev, NULL); iounmap(info->mem[0].internal_addr); iounmap(info->mem[1].internal_addr); diff --git a/drivers/uio/uio_netx.c b/drivers/uio/uio_netx.c index 4c345db..28a766b 100644 --- a/drivers/uio/uio_netx.c +++ b/drivers/uio/uio_netx.c @@ -127,6 +127,7 @@ static void netx_pci_remove(struct pci_dev *dev) uio_unregister_device(info); pci_release_regions(dev); pci_disable_device(dev); + pci_set_drvdata(dev, NULL); iounmap(info->mem[0].internal_addr); kfree(info); diff --git a/drivers/uio/uio_pdrv_genirq.c b/drivers/uio/uio_pdrv_genirq.c index 7666931..90ff17a 100644 --- a/drivers/uio/uio_pdrv_genirq.c +++ b/drivers/uio/uio_pdrv_genirq.c @@ -112,11 +112,11 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev) if (pdev->dev.of_node) { /* alloc uioinfo for one device */ - uioinfo = devm_kzalloc(&pdev->dev, sizeof(*uioinfo), - GFP_KERNEL); + uioinfo = kzalloc(sizeof(*uioinfo), GFP_KERNEL); if (!uioinfo) { + ret = -ENOMEM; dev_err(&pdev->dev, "unable to kmalloc\n"); - return -ENOMEM; + return ret; } uioinfo->name = pdev->dev.of_node->name; uioinfo->version = "devicetree"; @@ -125,19 +125,20 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev) if (!uioinfo || !uioinfo->name || !uioinfo->version) { dev_err(&pdev->dev, "missing platform_data\n"); - return ret; + goto bad0; } if (uioinfo->handler || uioinfo->irqcontrol || uioinfo->irq_flags & IRQF_SHARED) { dev_err(&pdev->dev, "interrupt configuration error\n"); - return ret; + goto bad0; } - priv = devm_kzalloc(&pdev->dev, sizeof(*priv), GFP_KERNEL); + priv = kzalloc(sizeof(*priv), GFP_KERNEL); if (!priv) { + ret = -ENOMEM; dev_err(&pdev->dev, "unable to kmalloc\n"); - return -ENOMEM; + goto bad0; } priv->uioinfo = uioinfo; @@ -152,7 +153,7 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev) uioinfo->irq = UIO_IRQ_NONE; else if (ret < 0) { dev_err(&pdev->dev, "failed to get IRQ\n"); - return ret; + goto bad1; } } @@ -208,12 +209,20 @@ static int uio_pdrv_genirq_probe(struct platform_device *pdev) ret = uio_register_device(&pdev->dev, priv->uioinfo); if (ret) { dev_err(&pdev->dev, "unable to register uio device\n"); - pm_runtime_disable(&pdev->dev); - return ret; + goto bad2; } platform_set_drvdata(pdev, priv); return 0; + bad2: + pm_runtime_disable(&pdev->dev); + bad1: + kfree(priv); + bad0: + /* kfree uioinfo for OF */ + if (pdev->dev.of_node) + kfree(uioinfo); + return ret; } static int uio_pdrv_genirq_remove(struct platform_device *pdev) @@ -226,6 +235,11 @@ static int uio_pdrv_genirq_remove(struct platform_device *pdev) priv->uioinfo->handler = NULL; priv->uioinfo->irqcontrol = NULL; + /* kfree uioinfo for OF */ + if (pdev->dev.of_node) + kfree(priv->uioinfo); + + kfree(priv); return 0; } diff --git a/drivers/uio/uio_pruss.c b/drivers/uio/uio_pruss.c index 96c4a19..f519da9 100644 --- a/drivers/uio/uio_pruss.c +++ b/drivers/uio/uio_pruss.c @@ -158,12 +158,14 @@ static int pruss_probe(struct platform_device *dev) if (pdata->sram_pool) { gdev->sram_pool = pdata->sram_pool; gdev->sram_vaddr = - (unsigned long)gen_pool_dma_alloc(gdev->sram_pool, - sram_pool_sz, &gdev->sram_paddr); + gen_pool_alloc(gdev->sram_pool, sram_pool_sz); if (!gdev->sram_vaddr) { dev_err(&dev->dev, "Could not allocate SRAM pool\n"); goto out_free; } + gdev->sram_paddr = + gen_pool_virt_to_phys(gdev->sram_pool, + gdev->sram_vaddr); } gdev->ddr_vaddr = dma_alloc_coherent(&dev->dev, extram_pool_sz, diff --git a/drivers/uio/uio_sercos3.c b/drivers/uio/uio_sercos3.c index 9cfdfca..5419832 100644 --- a/drivers/uio/uio_sercos3.c +++ b/drivers/uio/uio_sercos3.c @@ -188,6 +188,7 @@ static void sercos3_pci_remove(struct pci_dev *dev) uio_unregister_device(info); pci_release_regions(dev); pci_disable_device(dev); + pci_set_drvdata(dev, NULL); for (i = 0; i < 5; i++) { if (info->mem[i].internal_addr) iounmap(info->mem[i].internal_addr); |