diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-17 11:20:17 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-17 11:20:17 +1000 |
| commit | 8c75ad6394d9b6154f2a6a6ce647f43ddf3973e2 (patch) | |
| tree | da98fd41c29eed67e3a09653f7c64493411b2507 /drivers | |
| parent | 016e24b06dc17b4072428ac8bebede754b4246d3 (diff) | |
| parent | a77b00258ac902525fd77742e21f8ffeb1100c1e (diff) | |
Merge commit 'tip-core/auto-core-next'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/topology.c | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/drivers/base/topology.c b/drivers/base/topology.c index fdf4044d2e74..f0cb27011930 100644 --- a/drivers/base/topology.c +++ b/drivers/base/topology.c @@ -72,47 +72,27 @@ static inline ssize_t show_##name##_list(struct sys_device *dev, char *buf) \ #define define_siblings_show_func(name) \ define_siblings_show_map(name); define_siblings_show_list(name) -#ifdef topology_physical_package_id define_id_show_func(physical_package_id); define_one_ro(physical_package_id); -#define ref_physical_package_id_attr &attr_physical_package_id.attr, -#else -#define ref_physical_package_id_attr -#endif -#ifdef topology_core_id define_id_show_func(core_id); define_one_ro(core_id); -#define ref_core_id_attr &attr_core_id.attr, -#else -#define ref_core_id_attr -#endif -#ifdef topology_thread_siblings define_siblings_show_func(thread_siblings); define_one_ro(thread_siblings); define_one_ro(thread_siblings_list); -#define ref_thread_siblings_attr \ - &attr_thread_siblings.attr, &attr_thread_siblings_list.attr, -#else -#define ref_thread_siblings_attr -#endif -#ifdef topology_core_siblings define_siblings_show_func(core_siblings); define_one_ro(core_siblings); define_one_ro(core_siblings_list); -#define ref_core_siblings_attr \ - &attr_core_siblings.attr, &attr_core_siblings_list.attr, -#else -#define ref_core_siblings_attr -#endif static struct attribute *default_attrs[] = { - ref_physical_package_id_attr - ref_core_id_attr - ref_thread_siblings_attr - ref_core_siblings_attr + &attr_physical_package_id.attr, + &attr_core_id.attr, + &attr_thread_siblings.attr, + &attr_thread_siblings_list.attr, + &attr_core_siblings.attr, + &attr_core_siblings_list.attr, NULL }; |