Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
02438d87
C
clone-Linux
项目概览
gsplhtlxg
/
clone-Linux
通知
2
Star
0
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
C
clone-Linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
02438d87
编写于
6月 30, 2006
作者:
L
Len Brown
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
ACPI: delete acpi_os_free(), use kfree() directly
Signed-off-by:
N
Len Brown
<
len.brown@intel.com
>
上级
d120cfb5
变更
19
隐藏空白更改
内联
并排
Showing
19 changed file
with
36 addition
and
45 deletion
+36
-45
arch/ia64/kernel/acpi-ext.c
arch/ia64/kernel/acpi-ext.c
+1
-1
arch/ia64/kernel/acpi.c
arch/ia64/kernel/acpi.c
+6
-6
drivers/acpi/acpi_memhotplug.c
drivers/acpi/acpi_memhotplug.c
+2
-2
drivers/acpi/asus_acpi.c
drivers/acpi/asus_acpi.c
+3
-3
drivers/acpi/battery.c
drivers/acpi/battery.c
+2
-2
drivers/acpi/container.c
drivers/acpi/container.c
+1
-1
drivers/acpi/glue.c
drivers/acpi/glue.c
+4
-4
drivers/acpi/namespace/nsxfeval.c
drivers/acpi/namespace/nsxfeval.c
+1
-1
drivers/acpi/osl.c
drivers/acpi/osl.c
+1
-8
drivers/acpi/processor_idle.c
drivers/acpi/processor_idle.c
+1
-1
drivers/acpi/processor_perflib.c
drivers/acpi/processor_perflib.c
+3
-3
drivers/acpi/scan.c
drivers/acpi/scan.c
+2
-2
drivers/acpi/system.c
drivers/acpi/system.c
+2
-2
drivers/acpi/utilities/utalloc.c
drivers/acpi/utilities/utalloc.c
+2
-2
drivers/acpi/utilities/utcache.c
drivers/acpi/utilities/utcache.c
+1
-1
drivers/acpi/utils.c
drivers/acpi/utils.c
+2
-2
drivers/acpi/video.c
drivers/acpi/video.c
+1
-1
include/acpi/acmacros.h
include/acpi/acmacros.h
+1
-1
include/acpi/acpiosxf.h
include/acpi/acpiosxf.h
+0
-2
未找到文件。
arch/ia64/kernel/acpi-ext.c
浏览文件 @
02438d87
...
...
@@ -51,7 +51,7 @@ static acpi_status hp_ccsr_locate(acpi_handle obj, u64 *base, u64 *length)
memcpy
(
length
,
vendor
->
byte_data
+
8
,
sizeof
(
*
length
));
exit:
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
return
status
;
}
...
...
arch/ia64/kernel/acpi.c
浏览文件 @
02438d87
...
...
@@ -857,7 +857,7 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
obj
=
buffer
.
pointer
;
if
(
obj
->
type
!=
ACPI_TYPE_BUFFER
||
obj
->
buffer
.
length
<
sizeof
(
*
lsapic
))
{
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
return
-
EINVAL
;
}
...
...
@@ -865,13 +865,13 @@ int acpi_map_lsapic(acpi_handle handle, int *pcpu)
if
((
lsapic
->
header
.
type
!=
ACPI_MADT_LSAPIC
)
||
(
!
lsapic
->
flags
.
enabled
))
{
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
return
-
EINVAL
;
}
physid
=
((
lsapic
->
id
<<
8
)
|
(
lsapic
->
eid
));
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
buffer
.
length
=
ACPI_ALLOCATE_BUFFER
;
buffer
.
pointer
=
NULL
;
...
...
@@ -935,20 +935,20 @@ acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret)
obj
=
buffer
.
pointer
;
if
(
obj
->
type
!=
ACPI_TYPE_BUFFER
||
obj
->
buffer
.
length
<
sizeof
(
*
iosapic
))
{
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
return
AE_OK
;
}
iosapic
=
(
struct
acpi_table_iosapic
*
)
obj
->
buffer
.
pointer
;
if
(
iosapic
->
header
.
type
!=
ACPI_MADT_IOSAPIC
)
{
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
return
AE_OK
;
}
gsi_base
=
iosapic
->
global_irq_base
;
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
/*
* OK, it's an IOSAPIC MADT entry, look for a _PXM value to tell
...
...
drivers/acpi/acpi_memhotplug.c
浏览文件 @
02438d87
...
...
@@ -466,7 +466,7 @@ static acpi_status is_memory_device(acpi_handle handle)
info
=
buffer
.
pointer
;
if
(
!
(
info
->
valid
&
ACPI_VALID_HID
))
{
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
return
AE_ERROR
;
}
...
...
@@ -475,7 +475,7 @@ static acpi_status is_memory_device(acpi_handle handle)
(
strcmp
(
hardware_id
,
ACPI_MEMORY_DEVICE_HID
)))
status
=
AE_ERROR
;
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
return
status
;
}
...
...
drivers/acpi/asus_acpi.c
浏览文件 @
02438d87
...
...
@@ -1017,7 +1017,7 @@ static int asus_hotk_get_info(void)
}
hotk
->
methods
=
&
model_conf
[
hotk
->
model
];
acpi_os_
free
(
model
);
k
free
(
model
);
return
AE_OK
;
}
...
...
@@ -1096,7 +1096,7 @@ static int asus_hotk_get_info(void)
/* S1300A reports L84F, but L1400B too, account for that */
}
acpi_os_
free
(
model
);
k
free
(
model
);
return
AE_OK
;
}
...
...
@@ -1256,7 +1256,7 @@ static void __exit asus_acpi_exit(void)
acpi_bus_unregister_driver
(
&
asus_hotk_driver
);
remove_proc_entry
(
PROC_ASUS
,
acpi_root_dir
);
acpi_os_
free
(
asus_info
);
k
free
(
asus_info
);
return
;
}
...
...
drivers/acpi/battery.c
浏览文件 @
02438d87
...
...
@@ -171,7 +171,7 @@ acpi_battery_get_info(struct acpi_battery *battery,
}
end:
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
if
(
!
result
)
(
*
bif
)
=
(
struct
acpi_battery_info
*
)
data
.
pointer
;
...
...
@@ -231,7 +231,7 @@ acpi_battery_get_status(struct acpi_battery *battery,
}
end:
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
if
(
!
result
)
(
*
bst
)
=
(
struct
acpi_battery_status
*
)
data
.
pointer
;
...
...
drivers/acpi/container.c
浏览文件 @
02438d87
...
...
@@ -236,7 +236,7 @@ container_walk_namespace_cb(acpi_handle handle,
}
end:
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
return
AE_OK
;
}
...
...
drivers/acpi/glue.c
浏览文件 @
02438d87
...
...
@@ -152,7 +152,7 @@ static int get_root_bridge_busnr(acpi_handle handle)
bbn
=
bus
;
}
exit:
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
return
(
int
)
bbn
;
}
...
...
@@ -192,7 +192,7 @@ find_pci_rootbridge(acpi_handle handle, u32 lvl, void *context, void **rv)
find
->
handle
=
handle
;
status
=
AE_OK
;
exit:
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
return
status
;
}
...
...
@@ -224,7 +224,7 @@ do_acpi_find_child(acpi_handle handle, u32 lvl, void *context, void **rv)
info
=
buffer
.
pointer
;
if
(
info
->
address
==
find
->
address
)
find
->
handle
=
handle
;
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
}
return
AE_OK
;
}
...
...
@@ -330,7 +330,7 @@ static int acpi_platform_notify(struct device *dev)
acpi_get_name
(
dev
->
firmware_data
,
ACPI_FULL_PATHNAME
,
&
buffer
);
DBG
(
"Device %s -> %s
\n
"
,
dev
->
bus_id
,
(
char
*
)
buffer
.
pointer
);
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
}
else
DBG
(
"Device %s -> No ACPI support
\n
"
,
dev
->
bus_id
);
#endif
...
...
drivers/acpi/namespace/nsxfeval.c
浏览文件 @
02438d87
...
...
@@ -133,7 +133,7 @@ acpi_evaluate_object_typed(acpi_handle handle,
/* Caller used ACPI_ALLOCATE_BUFFER, free the return buffer */
acpi_os_free
(
return_buffer
->
pointer
);
ACPI_FREE
(
return_buffer
->
pointer
);
return_buffer
->
pointer
=
NULL
;
}
...
...
drivers/acpi/osl.c
浏览文件 @
02438d87
...
...
@@ -147,13 +147,6 @@ void *acpi_os_allocate(acpi_size size)
return
kmalloc
(
size
,
GFP_KERNEL
);
}
void
acpi_os_free
(
void
*
ptr
)
{
kfree
(
ptr
);
}
EXPORT_SYMBOL
(
acpi_os_free
);
acpi_status
acpi_os_get_root_pointer
(
u32
flags
,
struct
acpi_pointer
*
addr
)
{
if
(
efi_enabled
)
{
...
...
@@ -743,7 +736,7 @@ acpi_status acpi_os_delete_semaphore(acpi_handle handle)
ACPI_DEBUG_PRINT
((
ACPI_DB_MUTEX
,
"Deleting semaphore[%p].
\n
"
,
handle
));
acpi_os_
free
(
sem
);
k
free
(
sem
);
sem
=
NULL
;
return
AE_OK
;
...
...
drivers/acpi/processor_idle.c
浏览文件 @
02438d87
...
...
@@ -768,7 +768,7 @@ static int acpi_processor_get_power_info_cst(struct acpi_processor *pr)
status
=
-
EFAULT
;
end:
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
return
status
;
}
...
...
drivers/acpi/processor_perflib.c
浏览文件 @
02438d87
...
...
@@ -216,7 +216,7 @@ static int acpi_processor_get_performance_control(struct acpi_processor *pr)
sizeof
(
struct
acpi_pct_register
));
end:
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
return
result
;
}
...
...
@@ -294,7 +294,7 @@ static int acpi_processor_get_performance_states(struct acpi_processor *pr)
}
end:
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
return
result
;
}
...
...
@@ -592,7 +592,7 @@ static int acpi_processor_get_psd(struct acpi_processor *pr)
}
end:
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
return
result
;
}
...
...
drivers/acpi/scan.c
浏览文件 @
02438d87
...
...
@@ -319,7 +319,7 @@ static int acpi_bus_get_wakeup_device_flags(struct acpi_device *device)
goto
end
;
}
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
device
->
wakeup
.
flags
.
valid
=
1
;
/* Power button, Lid switch always enable wakeup */
...
...
@@ -854,7 +854,7 @@ static void acpi_device_set_id(struct acpi_device *device,
printk
(
KERN_ERR
"Memory allocation error
\n
"
);
}
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
}
static
int
acpi_device_set_context
(
struct
acpi_device
*
device
,
int
type
)
...
...
drivers/acpi/system.c
浏览文件 @
02438d87
...
...
@@ -86,7 +86,7 @@ acpi_system_read_dsdt(struct file *file,
res
=
simple_read_from_buffer
(
buffer
,
count
,
ppos
,
dsdt
.
pointer
,
dsdt
.
length
);
acpi_os_
free
(
dsdt
.
pointer
);
k
free
(
dsdt
.
pointer
);
return
res
;
}
...
...
@@ -113,7 +113,7 @@ acpi_system_read_fadt(struct file *file,
res
=
simple_read_from_buffer
(
buffer
,
count
,
ppos
,
fadt
.
pointer
,
fadt
.
length
);
acpi_os_
free
(
fadt
.
pointer
);
k
free
(
fadt
.
pointer
);
return
res
;
}
...
...
drivers/acpi/utilities/utalloc.c
浏览文件 @
02438d87
...
...
@@ -166,10 +166,10 @@ acpi_status acpi_ut_delete_caches(void)
/* Free memory lists */
acpi_os_free
(
acpi_gbl_global_list
);
ACPI_FREE
(
acpi_gbl_global_list
);
acpi_gbl_global_list
=
NULL
;
acpi_os_free
(
acpi_gbl_ns_node_list
);
ACPI_FREE
(
acpi_gbl_ns_node_list
);
acpi_gbl_ns_node_list
=
NULL
;
#endif
...
...
drivers/acpi/utilities/utcache.c
浏览文件 @
02438d87
...
...
@@ -162,7 +162,7 @@ acpi_status acpi_os_delete_cache(struct acpi_memory_list * cache)
/* Now we can delete the cache object */
acpi_os_free
(
cache
);
ACPI_FREE
(
cache
);
return
(
AE_OK
);
}
...
...
drivers/acpi/utils.c
浏览文件 @
02438d87
...
...
@@ -332,7 +332,7 @@ acpi_evaluate_string(acpi_handle handle,
ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Return value [%s]\n", *data));
acpi_os_
free(buffer.pointer);
k
free(buffer.pointer);
return AE_OK;
}
...
...
@@ -418,7 +418,7 @@ acpi_evaluate_reference(acpi_handle handle,
//kfree(list->handles);
}
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
return
status
;
}
...
...
drivers/acpi/video.c
浏览文件 @
02438d87
...
...
@@ -1450,7 +1450,7 @@ static int acpi_video_device_enumerate(struct acpi_video_bus *video)
video
->
attached_array
=
active_device_list
;
video
->
attached_count
=
count
;
out:
acpi_os_
free
(
buffer
.
pointer
);
k
free
(
buffer
.
pointer
);
return
status
;
}
...
...
include/acpi/acmacros.h
浏览文件 @
02438d87
...
...
@@ -726,7 +726,7 @@
#define ACPI_ALLOCATE(a) acpi_ut_allocate((acpi_size)(a),_COMPONENT,_acpi_module_name,__LINE__)
#define ACPI_ALLOCATE_ZEROED(a) acpi_ut_allocate_zeroed((acpi_size)(a), _COMPONENT,_acpi_module_name,__LINE__)
#define ACPI_FREE(a)
acpi_os_
free(a)
#define ACPI_FREE(a)
k
free(a)
#define ACPI_MEM_TRACKING(a)
#else
...
...
include/acpi/acpiosxf.h
浏览文件 @
02438d87
...
...
@@ -143,8 +143,6 @@ void acpi_os_release_mutex(acpi_mutex handle);
*/
void
*
acpi_os_allocate
(
acpi_size
size
);
void
acpi_os_free
(
void
*
memory
);
acpi_status
acpi_os_map_memory
(
acpi_physical_address
physical_address
,
acpi_size
size
,
void
__iomem
**
logical_address
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录