microsoft
/
WSL2-Linux-Kernel
зеркало из https://github.com/microsoft/WSL2-Linux-Kernel.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

USB: isp1362-hcd - use resource_size instead of defining its own resource_len macro 

Signed-off-by: Axel Lin <axel.lin@gmail.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Axel Lin 2010-10-15 13:27:57 +08:00 коммит произвёл Greg Kroah-Hartman
Родитель 7a9d93e585
Коммит 4e5c353b3c
1 изменённых файлов: 8 добавлений и 10 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

18
drivers/usb/host/isp1362-hcd.c
Просмотреть файл

@ -2649,8 +2649,6 @@ static struct hc_driver isp1362_hc_driver = {
/*-------------------------------------------------------------------------*/ /*-------------------------------------------------------------------------*/
#define resource_len(r) (((r)->end - (r)->start) + 1)
static int __devexit isp1362_remove(struct platform_device *pdev) static int __devexit isp1362_remove(struct platform_device *pdev)
{ {
struct usb_hcd *hcd = platform_get_drvdata(pdev); struct usb_hcd *hcd = platform_get_drvdata(pdev);
@ -2672,12 +2670,12 @@ static int __devexit isp1362_remove(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 1); res = platform_get_resource(pdev, IORESOURCE_MEM, 1);
DBG(0, "%s: release mem_region: %08lx\n", __func__, (long unsigned int)res->start); DBG(0, "%s: release mem_region: %08lx\n", __func__, (long unsigned int)res->start);
if (res) if (res)
release_mem_region(res->start, resource_len(res)); release_mem_region(res->start, resource_size(res));
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
DBG(0, "%s: release mem_region: %08lx\n", __func__, (long unsigned int)res->start); DBG(0, "%s: release mem_region: %08lx\n", __func__, (long unsigned int)res->start);
if (res) if (res)
release_mem_region(res->start, resource_len(res)); release_mem_region(res->start, resource_size(res));
DBG(0, "%s: put_hcd\n", __func__); DBG(0, "%s: put_hcd\n", __func__);
usb_put_hcd(hcd); usb_put_hcd(hcd);
@ -2723,21 +2721,21 @@ static int __init isp1362_probe(struct platform_device *pdev)
goto err1; goto err1;
} }
if (!request_mem_region(addr->start, resource_len(addr), hcd_name)) { if (!request_mem_region(addr->start, resource_size(addr), hcd_name)) {
retval = -EBUSY; retval = -EBUSY;
goto err1; goto err1;
} }
addr_reg = ioremap(addr->start, resource_len(addr)); addr_reg = ioremap(addr->start, resource_size(addr));
if (addr_reg == NULL) { if (addr_reg == NULL) {
retval = -ENOMEM; retval = -ENOMEM;
goto err2; goto err2;
} }
if (!request_mem_region(data->start, resource_len(data), hcd_name)) { if (!request_mem_region(data->start, resource_size(data), hcd_name)) {
retval = -EBUSY; retval = -EBUSY;
goto err3; goto err3;
} }
data_reg = ioremap(data->start, resource_len(data)); data_reg = ioremap(data->start, resource_size(data));
if (data_reg == NULL) { if (data_reg == NULL) {
retval = -ENOMEM; retval = -ENOMEM;
goto err4; goto err4;
@ -2795,13 +2793,13 @@ static int __init isp1362_probe(struct platform_device *pdev)
iounmap(data_reg); iounmap(data_reg);
err4: err4:
DBG(0, "%s: Releasing mem region %08lx\n", __func__, (long unsigned int)data->start); DBG(0, "%s: Releasing mem region %08lx\n", __func__, (long unsigned int)data->start);
release_mem_region(data->start, resource_len(data)); release_mem_region(data->start, resource_size(data));
err3: err3:
DBG(0, "%s: Unmapping addr_reg @ %p\n", __func__, addr_reg); DBG(0, "%s: Unmapping addr_reg @ %p\n", __func__, addr_reg);
iounmap(addr_reg); iounmap(addr_reg);
err2: err2:
DBG(0, "%s: Releasing mem region %08lx\n", __func__, (long unsigned int)addr->start); DBG(0, "%s: Releasing mem region %08lx\n", __func__, (long unsigned int)addr->start);
release_mem_region(addr->start, resource_len(addr)); release_mem_region(addr->start, resource_size(addr));
err1: err1:
pr_err("%s: init error, %d\n", __func__, retval); pr_err("%s: init error, %d\n", __func__, retval);