Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xiphi1978
linux
提交
c71d6be5
L
linux
项目概览
xiphi1978
/
linux
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
L
linux
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
c71d6be5
编写于
8月 08, 2006
作者:
J
Jeff Garzik
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'tj-upstream-fixes' of
git://htj.dyndns.org/libata-tj
into upstream-fixes
上级
9f737633
77f3f879
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
9 addition
and
27 deletion
+9
-27
drivers/scsi/ata_piix.c
drivers/scsi/ata_piix.c
+1
-0
drivers/scsi/libata-core.c
drivers/scsi/libata-core.c
+8
-26
drivers/scsi/sata_sil24.c
drivers/scsi/sata_sil24.c
+0
-1
未找到文件。
drivers/scsi/ata_piix.c
浏览文件 @
c71d6be5
...
@@ -828,6 +828,7 @@ static void __devinit piix_init_sata_map(struct pci_dev *pdev,
...
@@ -828,6 +828,7 @@ static void __devinit piix_init_sata_map(struct pci_dev *pdev,
case
IDE
:
case
IDE
:
WARN_ON
((
i
&
1
)
||
map
[
i
+
1
]
!=
IDE
);
WARN_ON
((
i
&
1
)
||
map
[
i
+
1
]
!=
IDE
);
pinfo
[
i
/
2
]
=
piix_port_info
[
ich5_pata
];
pinfo
[
i
/
2
]
=
piix_port_info
[
ich5_pata
];
pinfo
[
i
/
2
].
private_data
=
hpriv
;
i
++
;
i
++
;
printk
(
" IDE IDE"
);
printk
(
" IDE IDE"
);
break
;
break
;
...
...
drivers/scsi/libata-core.c
浏览文件 @
c71d6be5
...
@@ -5185,28 +5185,6 @@ void ata_host_stop (struct ata_host_set *host_set)
...
@@ -5185,28 +5185,6 @@ void ata_host_stop (struct ata_host_set *host_set)
iounmap
(
host_set
->
mmio_base
);
iounmap
(
host_set
->
mmio_base
);
}
}
/**
* ata_host_remove - Unregister SCSI host structure with upper layers
* @ap: Port to unregister
* @do_unregister: 1 if we fully unregister, 0 to just stop the port
*
* LOCKING:
* Inherited from caller.
*/
static
void
ata_host_remove
(
struct
ata_port
*
ap
,
unsigned
int
do_unregister
)
{
struct
Scsi_Host
*
sh
=
ap
->
host
;
DPRINTK
(
"ENTER
\n
"
);
if
(
do_unregister
)
scsi_remove_host
(
sh
);
ap
->
ops
->
port_stop
(
ap
);
}
/**
/**
* ata_dev_init - Initialize an ata_device structure
* ata_dev_init - Initialize an ata_device structure
* @dev: Device structure to initialize
* @dev: Device structure to initialize
...
@@ -5532,8 +5510,11 @@ int ata_device_add(const struct ata_probe_ent *ent)
...
@@ -5532,8 +5510,11 @@ int ata_device_add(const struct ata_probe_ent *ent)
err_out:
err_out:
for
(
i
=
0
;
i
<
count
;
i
++
)
{
for
(
i
=
0
;
i
<
count
;
i
++
)
{
ata_host_remove
(
host_set
->
ports
[
i
],
1
);
struct
ata_port
*
ap
=
host_set
->
ports
[
i
];
scsi_host_put
(
host_set
->
ports
[
i
]
->
host
);
if
(
ap
)
{
ap
->
ops
->
port_stop
(
ap
);
scsi_host_put
(
ap
->
host
);
}
}
}
err_free_ret:
err_free_ret:
kfree
(
host_set
);
kfree
(
host_set
);
...
@@ -5558,7 +5539,7 @@ void ata_port_detach(struct ata_port *ap)
...
@@ -5558,7 +5539,7 @@ void ata_port_detach(struct ata_port *ap)
int
i
;
int
i
;
if
(
!
ap
->
ops
->
error_handler
)
if
(
!
ap
->
ops
->
error_handler
)
return
;
goto
skip_eh
;
/* tell EH we're leaving & flush EH */
/* tell EH we're leaving & flush EH */
spin_lock_irqsave
(
ap
->
lock
,
flags
);
spin_lock_irqsave
(
ap
->
lock
,
flags
);
...
@@ -5594,6 +5575,7 @@ void ata_port_detach(struct ata_port *ap)
...
@@ -5594,6 +5575,7 @@ void ata_port_detach(struct ata_port *ap)
cancel_delayed_work
(
&
ap
->
hotplug_task
);
cancel_delayed_work
(
&
ap
->
hotplug_task
);
flush_workqueue
(
ata_aux_wq
);
flush_workqueue
(
ata_aux_wq
);
skip_eh:
/* remove the associated SCSI host */
/* remove the associated SCSI host */
scsi_remove_host
(
ap
->
host
);
scsi_remove_host
(
ap
->
host
);
}
}
...
@@ -5662,7 +5644,7 @@ int ata_scsi_release(struct Scsi_Host *host)
...
@@ -5662,7 +5644,7 @@ int ata_scsi_release(struct Scsi_Host *host)
DPRINTK
(
"ENTER
\n
"
);
DPRINTK
(
"ENTER
\n
"
);
ap
->
ops
->
port_disable
(
ap
);
ap
->
ops
->
port_disable
(
ap
);
a
ta_host_remove
(
ap
,
0
);
a
p
->
ops
->
port_stop
(
ap
);
DPRINTK
(
"EXIT
\n
"
);
DPRINTK
(
"EXIT
\n
"
);
return
1
;
return
1
;
...
...
drivers/scsi/sata_sil24.c
浏览文件 @
c71d6be5
...
@@ -1106,7 +1106,6 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
...
@@ -1106,7 +1106,6 @@ static int sil24_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
probe_ent
->
irq
=
pdev
->
irq
;
probe_ent
->
irq
=
pdev
->
irq
;
probe_ent
->
irq_flags
=
IRQF_SHARED
;
probe_ent
->
irq_flags
=
IRQF_SHARED
;
probe_ent
->
mmio_base
=
port_base
;
probe_ent
->
private_data
=
hpriv
;
probe_ent
->
private_data
=
hpriv
;
hpriv
->
host_base
=
host_base
;
hpriv
->
host_base
=
host_base
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录