Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
gsplhtlxg
clone-Linux
提交
193515d5
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,发现更多精彩内容 >>
提交
193515d5
编写于
11月 07, 2005
作者:
J
Jeff Garzik
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
[libata] eliminate use of drivers/scsi/scsi.h compatibility header/defines
上级
0b154bb7
变更
18
显示空白变更内容
内联
并排
Showing
18 changed file
with
25 addition
and
35 deletion
+25
-35
drivers/scsi/ahci.c
drivers/scsi/ahci.c
+2
-2
drivers/scsi/ata_piix.c
drivers/scsi/ata_piix.c
+1
-2
drivers/scsi/libata-core.c
drivers/scsi/libata-core.c
+1
-1
drivers/scsi/libata-scsi.c
drivers/scsi/libata-scsi.c
+1
-1
drivers/scsi/pdc_adma.c
drivers/scsi/pdc_adma.c
+1
-2
drivers/scsi/sata_mv.c
drivers/scsi/sata_mv.c
+2
-2
drivers/scsi/sata_nv.c
drivers/scsi/sata_nv.c
+1
-2
drivers/scsi/sata_promise.c
drivers/scsi/sata_promise.c
+2
-2
drivers/scsi/sata_qstor.c
drivers/scsi/sata_qstor.c
+1
-2
drivers/scsi/sata_sil.c
drivers/scsi/sata_sil.c
+1
-2
drivers/scsi/sata_sil24.c
drivers/scsi/sata_sil24.c
+2
-2
drivers/scsi/sata_sis.c
drivers/scsi/sata_sis.c
+1
-2
drivers/scsi/sata_svw.c
drivers/scsi/sata_svw.c
+1
-2
drivers/scsi/sata_sx4.c
drivers/scsi/sata_sx4.c
+2
-2
drivers/scsi/sata_uli.c
drivers/scsi/sata_uli.c
+1
-2
drivers/scsi/sata_via.c
drivers/scsi/sata_via.c
+1
-2
drivers/scsi/sata_vsc.c
drivers/scsi/sata_vsc.c
+1
-2
include/linux/libata.h
include/linux/libata.h
+3
-3
未找到文件。
drivers/scsi/ahci.c
浏览文件 @
193515d5
...
...
@@ -42,8 +42,8 @@
#include <linux/sched.h>
#include <linux/dma-mapping.h>
#include <linux/device.h>
#include "scsi.h"
#include <scsi/scsi_host.h>
#include <scsi/scsi_cmnd.h>
#include <linux/libata.h>
#include <asm/io.h>
...
...
@@ -196,7 +196,7 @@ static u8 ahci_check_status(struct ata_port *ap);
static
inline
int
ahci_host_intr
(
struct
ata_port
*
ap
,
struct
ata_queued_cmd
*
qc
);
static
void
ahci_remove_one
(
struct
pci_dev
*
pdev
);
static
Scsi_Host_T
emplate
ahci_sht
=
{
static
struct
scsi_host_t
emplate
ahci_sht
=
{
.
module
=
THIS_MODULE
,
.
name
=
DRV_NAME
,
.
ioctl
=
ata_scsi_ioctl
,
...
...
drivers/scsi/ata_piix.c
浏览文件 @
193515d5
...
...
@@ -46,7 +46,6 @@
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
#include "scsi.h"
#include <scsi/scsi_host.h>
#include <linux/libata.h>
...
...
@@ -128,7 +127,7 @@ static struct pci_driver piix_pci_driver = {
.
remove
=
ata_pci_remove_one
,
};
static
Scsi_Host_T
emplate
piix_sht
=
{
static
struct
scsi_host_t
emplate
piix_sht
=
{
.
module
=
THIS_MODULE
,
.
name
=
DRV_NAME
,
.
ioctl
=
ata_scsi_ioctl
,
...
...
drivers/scsi/libata-core.c
浏览文件 @
193515d5
...
...
@@ -51,8 +51,8 @@
#include <linux/jiffies.h>
#include <linux/scatterlist.h>
#include <scsi/scsi.h>
#include "scsi.h"
#include "scsi_priv.h"
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_host.h>
#include <linux/libata.h>
#include <asm/io.h>
...
...
drivers/scsi/libata-scsi.c
浏览文件 @
193515d5
...
...
@@ -37,9 +37,9 @@
#include <linux/blkdev.h>
#include <linux/spinlock.h>
#include <scsi/scsi.h>
#include "scsi.h"
#include <scsi/scsi_host.h>
#include <scsi/scsi_device.h>
#include <scsi/scsi_request.h>
#include <linux/libata.h>
#include <linux/hdreg.h>
#include <asm/uaccess.h>
...
...
drivers/scsi/pdc_adma.c
浏览文件 @
193515d5
...
...
@@ -41,7 +41,6 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
#include <linux/device.h>
#include "scsi.h"
#include <scsi/scsi_host.h>
#include <asm/io.h>
#include <linux/libata.h>
...
...
@@ -139,7 +138,7 @@ static u8 adma_bmdma_status(struct ata_port *ap);
static
void
adma_irq_clear
(
struct
ata_port
*
ap
);
static
void
adma_eng_timeout
(
struct
ata_port
*
ap
);
static
Scsi_Host_T
emplate
adma_ata_sht
=
{
static
struct
scsi_host_t
emplate
adma_ata_sht
=
{
.
module
=
THIS_MODULE
,
.
name
=
DRV_NAME
,
.
ioctl
=
ata_scsi_ioctl
,
...
...
drivers/scsi/sata_mv.c
浏览文件 @
193515d5
...
...
@@ -30,8 +30,8 @@
#include <linux/sched.h>
#include <linux/dma-mapping.h>
#include <linux/device.h>
#include "scsi.h"
#include <scsi/scsi_host.h>
#include <scsi/scsi_cmnd.h>
#include <linux/libata.h>
#include <asm/io.h>
...
...
@@ -270,7 +270,7 @@ static irqreturn_t mv_interrupt(int irq, void *dev_instance,
static
void
mv_eng_timeout
(
struct
ata_port
*
ap
);
static
int
mv_init_one
(
struct
pci_dev
*
pdev
,
const
struct
pci_device_id
*
ent
);
static
Scsi_Host_T
emplate
mv_sht
=
{
static
struct
scsi_host_t
emplate
mv_sht
=
{
.
module
=
THIS_MODULE
,
.
name
=
DRV_NAME
,
.
ioctl
=
ata_scsi_ioctl
,
...
...
drivers/scsi/sata_nv.c
浏览文件 @
193515d5
...
...
@@ -62,7 +62,6 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/device.h>
#include "scsi.h"
#include <scsi/scsi_host.h>
#include <linux/libata.h>
...
...
@@ -219,7 +218,7 @@ static struct pci_driver nv_pci_driver = {
.
remove
=
ata_pci_remove_one
,
};
static
Scsi_Host_T
emplate
nv_sht
=
{
static
struct
scsi_host_t
emplate
nv_sht
=
{
.
module
=
THIS_MODULE
,
.
name
=
DRV_NAME
,
.
ioctl
=
ata_scsi_ioctl
,
...
...
drivers/scsi/sata_promise.c
浏览文件 @
193515d5
...
...
@@ -39,8 +39,8 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
#include <linux/device.h>
#include "scsi.h"
#include <scsi/scsi_host.h>
#include <scsi/scsi_cmnd.h>
#include <linux/libata.h>
#include <asm/io.h>
#include "sata_promise.h"
...
...
@@ -94,7 +94,7 @@ static void pdc_irq_clear(struct ata_port *ap);
static
int
pdc_qc_issue_prot
(
struct
ata_queued_cmd
*
qc
);
static
Scsi_Host_T
emplate
pdc_ata_sht
=
{
static
struct
scsi_host_t
emplate
pdc_ata_sht
=
{
.
module
=
THIS_MODULE
,
.
name
=
DRV_NAME
,
.
ioctl
=
ata_scsi_ioctl
,
...
...
drivers/scsi/sata_qstor.c
浏览文件 @
193515d5
...
...
@@ -36,7 +36,6 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
#include <linux/device.h>
#include "scsi.h"
#include <scsi/scsi_host.h>
#include <asm/io.h>
#include <linux/libata.h>
...
...
@@ -128,7 +127,7 @@ static u8 qs_bmdma_status(struct ata_port *ap);
static
void
qs_irq_clear
(
struct
ata_port
*
ap
);
static
void
qs_eng_timeout
(
struct
ata_port
*
ap
);
static
Scsi_Host_T
emplate
qs_ata_sht
=
{
static
struct
scsi_host_t
emplate
qs_ata_sht
=
{
.
module
=
THIS_MODULE
,
.
name
=
DRV_NAME
,
.
ioctl
=
ata_scsi_ioctl
,
...
...
drivers/scsi/sata_sil.c
浏览文件 @
193515d5
...
...
@@ -42,7 +42,6 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/device.h>
#include "scsi.h"
#include <scsi/scsi_host.h>
#include <linux/libata.h>
...
...
@@ -131,7 +130,7 @@ static struct pci_driver sil_pci_driver = {
.
remove
=
ata_pci_remove_one
,
};
static
Scsi_Host_T
emplate
sil_sht
=
{
static
struct
scsi_host_t
emplate
sil_sht
=
{
.
module
=
THIS_MODULE
,
.
name
=
DRV_NAME
,
.
ioctl
=
ata_scsi_ioctl
,
...
...
drivers/scsi/sata_sil24.c
浏览文件 @
193515d5
...
...
@@ -37,7 +37,7 @@
#include <linux/dma-mapping.h>
#include <linux/device.h>
#include <scsi/scsi_host.h>
#include
"scsi.h"
#include
<scsi/scsi_cmnd.h>
#include <linux/libata.h>
#include <asm/io.h>
...
...
@@ -255,7 +255,7 @@ static struct pci_driver sil24_pci_driver = {
.
remove
=
ata_pci_remove_one
,
/* safe? */
};
static
Scsi_Host_T
emplate
sil24_sht
=
{
static
struct
scsi_host_t
emplate
sil24_sht
=
{
.
module
=
THIS_MODULE
,
.
name
=
DRV_NAME
,
.
ioctl
=
ata_scsi_ioctl
,
...
...
drivers/scsi/sata_sis.c
浏览文件 @
193515d5
...
...
@@ -39,7 +39,6 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/device.h>
#include "scsi.h"
#include <scsi/scsi_host.h>
#include <linux/libata.h>
...
...
@@ -83,7 +82,7 @@ static struct pci_driver sis_pci_driver = {
.
remove
=
ata_pci_remove_one
,
};
static
Scsi_Host_T
emplate
sis_sht
=
{
static
struct
scsi_host_t
emplate
sis_sht
=
{
.
module
=
THIS_MODULE
,
.
name
=
DRV_NAME
,
.
ioctl
=
ata_scsi_ioctl
,
...
...
drivers/scsi/sata_svw.c
浏览文件 @
193515d5
...
...
@@ -45,7 +45,6 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/device.h>
#include "scsi.h"
#include <scsi/scsi_host.h>
#include <linux/libata.h>
...
...
@@ -284,7 +283,7 @@ static int k2_sata_proc_info(struct Scsi_Host *shost, char *page, char **start,
#endif
/* CONFIG_PPC_OF */
static
Scsi_Host_T
emplate
k2_sata_sht
=
{
static
struct
scsi_host_t
emplate
k2_sata_sht
=
{
.
module
=
THIS_MODULE
,
.
name
=
DRV_NAME
,
.
ioctl
=
ata_scsi_ioctl
,
...
...
drivers/scsi/sata_sx4.c
浏览文件 @
193515d5
...
...
@@ -39,8 +39,8 @@
#include <linux/interrupt.h>
#include <linux/sched.h>
#include <linux/device.h>
#include "scsi.h"
#include <scsi/scsi_host.h>
#include <scsi/scsi_cmnd.h>
#include <linux/libata.h>
#include <asm/io.h>
#include "sata_promise.h"
...
...
@@ -177,7 +177,7 @@ static void pdc20621_irq_clear(struct ata_port *ap);
static
int
pdc20621_qc_issue_prot
(
struct
ata_queued_cmd
*
qc
);
static
Scsi_Host_T
emplate
pdc_sata_sht
=
{
static
struct
scsi_host_t
emplate
pdc_sata_sht
=
{
.
module
=
THIS_MODULE
,
.
name
=
DRV_NAME
,
.
ioctl
=
ata_scsi_ioctl
,
...
...
drivers/scsi/sata_uli.c
浏览文件 @
193515d5
...
...
@@ -33,7 +33,6 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/device.h>
#include "scsi.h"
#include <scsi/scsi_host.h>
#include <linux/libata.h>
...
...
@@ -71,7 +70,7 @@ static struct pci_driver uli_pci_driver = {
.
remove
=
ata_pci_remove_one
,
};
static
Scsi_Host_T
emplate
uli_sht
=
{
static
struct
scsi_host_t
emplate
uli_sht
=
{
.
module
=
THIS_MODULE
,
.
name
=
DRV_NAME
,
.
ioctl
=
ata_scsi_ioctl
,
...
...
drivers/scsi/sata_via.c
浏览文件 @
193515d5
...
...
@@ -42,7 +42,6 @@
#include <linux/blkdev.h>
#include <linux/delay.h>
#include <linux/device.h>
#include "scsi.h"
#include <scsi/scsi_host.h>
#include <linux/libata.h>
#include <asm/io.h>
...
...
@@ -90,7 +89,7 @@ static struct pci_driver svia_pci_driver = {
.
remove
=
ata_pci_remove_one
,
};
static
Scsi_Host_T
emplate
svia_sht
=
{
static
struct
scsi_host_t
emplate
svia_sht
=
{
.
module
=
THIS_MODULE
,
.
name
=
DRV_NAME
,
.
ioctl
=
ata_scsi_ioctl
,
...
...
drivers/scsi/sata_vsc.c
浏览文件 @
193515d5
...
...
@@ -43,7 +43,6 @@
#include <linux/interrupt.h>
#include <linux/dma-mapping.h>
#include <linux/device.h>
#include "scsi.h"
#include <scsi/scsi_host.h>
#include <linux/libata.h>
...
...
@@ -219,7 +218,7 @@ static irqreturn_t vsc_sata_interrupt (int irq, void *dev_instance,
}
static
Scsi_Host_T
emplate
vsc_sata_sht
=
{
static
struct
scsi_host_t
emplate
vsc_sata_sht
=
{
.
module
=
THIS_MODULE
,
.
name
=
DRV_NAME
,
.
ioctl
=
ata_scsi_ioctl
,
...
...
include/linux/libata.h
浏览文件 @
193515d5
...
...
@@ -214,7 +214,7 @@ struct ata_probe_ent {
struct
list_head
node
;
struct
device
*
dev
;
const
struct
ata_port_operations
*
port_ops
;
Scsi_Host_Template
*
sht
;
struct
scsi_host_template
*
sht
;
struct
ata_ioports
port
[
ATA_MAX_PORTS
];
unsigned
int
n_ports
;
unsigned
int
hard_port_no
;
...
...
@@ -398,7 +398,7 @@ struct ata_port_operations {
};
struct
ata_port_info
{
Scsi_Host_Template
*
sht
;
struct
scsi_host_template
*
sht
;
unsigned
long
host_flags
;
unsigned
long
pio_mask
;
unsigned
long
mwdma_mask
;
...
...
@@ -433,7 +433,7 @@ extern void ata_pci_remove_one (struct pci_dev *pdev);
#endif
/* CONFIG_PCI */
extern
int
ata_device_add
(
const
struct
ata_probe_ent
*
ent
);
extern
void
ata_host_set_remove
(
struct
ata_host_set
*
host_set
);
extern
int
ata_scsi_detect
(
Scsi_Host_T
emplate
*
sht
);
extern
int
ata_scsi_detect
(
struct
scsi_host_t
emplate
*
sht
);
extern
int
ata_scsi_ioctl
(
struct
scsi_device
*
dev
,
int
cmd
,
void
__user
*
arg
);
extern
int
ata_scsi_queuecmd
(
struct
scsi_cmnd
*
cmd
,
void
(
*
done
)(
struct
scsi_cmnd
*
));
extern
int
ata_scsi_error
(
struct
Scsi_Host
*
host
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录