commit: http://blackfin.uclinux.org/git/?p=linux-kernel;a=commitdiff;h=9a18ce5acea59c6b6d3e9d884ad0d9b49c354adb branch: http://blackfin.uclinux.org/git/?p=linux-kernel;a=shortlog;h=refs/heads/trunk
Signed-off-by: Sonic Zhang <[email protected]> Signed-off-by: Bob Liu <[email protected]> --- drivers/char/bfin_crc.c | 19 ++++--------------- 1 files changed, 4 insertions(+), 15 deletions(-) diff --git a/drivers/char/bfin_crc.c b/drivers/char/bfin_crc.c index 391b54b..44a85da 100644 --- a/drivers/char/bfin_crc.c +++ b/drivers/char/bfin_crc.c @@ -371,31 +371,24 @@ static int __devinit bfin_crc_probe(struct platform_device *pdev) return -ENOMEM; } - ret = peripheral_request_list( - (unsigned short *)pdev->dev.platform_data, DRIVER_NAME); - if (ret) { - dev_err(&pdev->dev, - "fail to request bfin serial peripherals\n"); - goto out_error_free_mem; - } - mutex_init(&crc->mutex); crc->mdev.minor = MISC_DYNAMIC_MINOR; - crc->mdev.name = DRIVER_NAME; + snprintf(crc->name, 20, "%s%d", DRIVER_NAME, pdev->id); + crc->mdev.name = crc->name; crc->mdev.fops = &bfin_crc_fops; res = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (res == NULL) { dev_err(&pdev->dev, "Cannot get IORESOURCE_MEM\n"); ret = -ENOENT; - goto out_error_free_peripherals; + goto out_error_free_mem; } crc->regs = ioremap(res->start, resource_size(res)); if (!crc->regs) { dev_err(&pdev->dev, "Cannot map CRC IO\n"); ret = -ENXIO; - goto out_error_free_peripherals; + goto out_error_free_mem; } crc->irq = platform_get_irq(pdev, 0); @@ -436,8 +429,6 @@ static int __devinit bfin_crc_probe(struct platform_device *pdev) out_error_unmap: iounmap((void *)crc->regs); -out_error_free_peripherals: - peripheral_free_list((unsigned short *)pdev->dev.platform_data); out_error_free_mem: kfree(crc); return ret; @@ -459,8 +450,6 @@ static int __devexit bfin_crc_remove(struct platform_device *pdev) misc_deregister(&crc->mdev); list_del(&crc->list); iounmap((void *)crc->regs); - peripheral_free_list( - (unsigned short *)pdev->dev.platform_data); kfree(crc); }
_______________________________________________ Linux-kernel-commits mailing list [email protected] https://blackfin.uclinux.org/mailman/listinfo/linux-kernel-commits
