shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

VPU: remove dev_set_name.

Browse Source 
dev_set_name is prohibit in linux, and may casue system
warning dump.

Signed-off-by: Alpha Lin <alpha.lin@rock-chips.com>
This commit is contained in:
Alpha Lin
2015-03-13 10:27:56 +08:00
parent 5f8a929f59
commit f27b31eae5
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
arch/arm/mach-rockchip/vcodec_service.c
View File

@@ -14,6 +14,8 @@
*
*/
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
#include <linux/clk.h>
#include <linux/delay.h>
#include <linux/init.h>
@@ -1951,7 +1953,7 @@ static int vcodec_subdev_probe(struct platform_device *pdev,
of_property_read_string(np, "name", (const char**)&name);
of_property_read_u32(np, "dev_mode", (u32*)&data->mode);
dev_set_name(dev, name);
/*dev_set_name(dev, name);*/
if (pservice->reg_base == 0) {
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
@@ -2052,7 +2054,7 @@ static int vcodec_subdev_probe(struct platform_device *pdev,
goto err;
}
data->cls = class_create(THIS_MODULE, dev_name(dev));
data->cls = class_create(THIS_MODULE, name);
if (IS_ERR(data->cls)) {
ret = PTR_ERR(data->cls);
@@ -2061,7 +2063,7 @@ static int vcodec_subdev_probe(struct platform_device *pdev,
}
data->child_dev = device_create(data->cls, dev,
data->dev_t, NULL, dev_name(dev));
data->dev_t, NULL, name);
get_hw_info(data);
@@ -2069,18 +2071,18 @@ static int vcodec_subdev_probe(struct platform_device *pdev,
INIT_LIST_HEAD(&data->lnk_service);
list_add_tail(&data->lnk_service, &pservice->subdev_list);
#ifdef CONFIG_DEBUG_FS
data->debugfs_dir =
vcodec_debugfs_create_device_dir((char*)dev_name(dev), parent);
vcodec_debugfs_create_device_dir((char*)name, parent);
if (data->debugfs_dir == NULL)
vpu_err("create debugfs dir %s failed\n", dev_name(dev));
vpu_err("create debugfs dir %s failed\n", name);
data->debugfs_file_regs =
debugfs_create_file("regs", 0664,
data->debugfs_dir, data,
&debug_vcodec_fops);
#endif
#endif
return 0;
err:
if (data->irq_enc > 0)