Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openthos
linux
提交
c79bea07
L
linux
项目概览
openthos
/
linux
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c79bea07
编写于
4月 19, 2005
作者:
L
Linus Torvalds
浏览文件
操作
浏览文件
下载
差异文件
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6.git/
上级
a9e4820c
1d66c64c
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
10 addition
and
10 deletion
+10
-10
drivers/i2c/chips/it87.c
drivers/i2c/chips/it87.c
+1
-1
drivers/i2c/chips/via686a.c
drivers/i2c/chips/via686a.c
+2
-3
drivers/w1/w1.c
drivers/w1/w1.c
+5
-4
drivers/w1/w1_smem.c
drivers/w1/w1_smem.c
+2
-2
未找到文件。
drivers/i2c/chips/it87.c
浏览文件 @
c79bea07
...
...
@@ -668,7 +668,7 @@ static ssize_t show_alarms(struct device *dev, char *buf)
struct
it87_data
*
data
=
it87_update_device
(
dev
);
return
sprintf
(
buf
,
"%d
\n
"
,
ALARMS_FROM_REG
(
data
->
alarms
));
}
static
DEVICE_ATTR
(
alarms
,
S_IRUGO
|
S_IWUSR
,
show_alarms
,
NULL
);
static
DEVICE_ATTR
(
alarms
,
S_IRUGO
,
show_alarms
,
NULL
);
static
ssize_t
show_vrm_reg
(
struct
device
*
dev
,
char
*
buf
)
...
...
drivers/i2c/chips/via686a.c
浏览文件 @
c79bea07
...
...
@@ -574,7 +574,7 @@ static ssize_t show_alarms(struct device *dev, char *buf) {
struct
via686a_data
*
data
=
via686a_update_device
(
dev
);
return
sprintf
(
buf
,
"%d
\n
"
,
ALARMS_FROM_REG
(
data
->
alarms
));
}
static
DEVICE_ATTR
(
alarms
,
S_IRUGO
|
S_IWUSR
,
show_alarms
,
NULL
);
static
DEVICE_ATTR
(
alarms
,
S_IRUGO
,
show_alarms
,
NULL
);
/* The driver. I choose to use type i2c_driver, as at is identical to both
smbus_driver and isa_driver, and clients could be of either kind */
...
...
@@ -651,10 +651,9 @@ static int via686a_detect(struct i2c_adapter *adapter, int address, int kind)
new_client
->
adapter
=
adapter
;
new_client
->
driver
=
&
via686a_driver
;
new_client
->
flags
=
0
;
new_client
->
dev
.
parent
=
&
adapter
->
dev
;
/* Fill in the remaining client fields and put into the global list */
s
nprintf
(
new_client
->
name
,
I2C_NAME_SIZE
,
client_name
);
s
trlcpy
(
new_client
->
name
,
client_name
,
I2C_NAME_SIZE
);
data
->
valid
=
0
;
init_MUTEX
(
&
data
->
update_lock
);
...
...
drivers/w1/w1.c
浏览文件 @
c79bea07
...
...
@@ -522,10 +522,11 @@ void w1_slave_found(unsigned long data, u64 rn)
slave_count
++
;
}
if
(
slave_count
==
dev
->
slave_count
&&
rn
)
{
tmp
=
cpu_to_le64
(
rn
);
if
(((
rn
>>
56
)
&
0xff
)
==
w1_calc_crc8
((
u8
*
)
&
tmp
,
7
))
w1_attach_slave_device
(
dev
,
(
struct
w1_reg_num
*
)
&
rn
);
rn
=
cpu_to_le64
(
rn
);
if
(
slave_count
==
dev
->
slave_count
&&
rn
&&
((
le64_to_cpu
(
rn
)
>>
56
)
&
0xff
)
==
w1_calc_crc8
((
u8
*
)
&
rn
,
7
))
{
w1_attach_slave_device
(
dev
,
tmp
);
}
atomic_dec
(
&
dev
->
refcnt
);
...
...
drivers/w1/w1_smem.c
浏览文件 @
c79bea07
...
...
@@ -60,7 +60,7 @@ static ssize_t w1_smem_read_val(struct device *dev, char *buf)
int
i
;
ssize_t
count
=
0
;
for
(
i
=
0
;
i
<
9
;
++
i
)
for
(
i
=
0
;
i
<
8
;
++
i
)
count
+=
sprintf
(
buf
+
count
,
"%02x "
,
((
u8
*
)
&
sl
->
reg_num
)[
i
]);
count
+=
sprintf
(
buf
+
count
,
"
\n
"
);
...
...
@@ -87,7 +87,7 @@ static ssize_t w1_smem_read_bin(struct kobject *kobj, char *buf, loff_t off, siz
count
=
0
;
goto
out
;
}
for
(
i
=
0
;
i
<
9
;
++
i
)
for
(
i
=
0
;
i
<
8
;
++
i
)
count
+=
sprintf
(
buf
+
count
,
"%02x "
,
((
u8
*
)
&
sl
->
reg_num
)[
i
]);
count
+=
sprintf
(
buf
+
count
,
"
\n
"
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录