Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
5f502413
Commit
5f502413
authored
Sep 08, 2005
by
Linus Torvalds
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'upstream' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
parents
82b7ec75
8add7885
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
25 deletions
+11
-25
drivers/scsi/sata_mv.c
drivers/scsi/sata_mv.c
+0
-16
drivers/scsi/sata_sis.c
drivers/scsi/sata_sis.c
+11
-9
No files found.
drivers/scsi/sata_mv.c
View file @
5f502413
...
...
@@ -699,22 +699,6 @@ static int mv_host_init(struct ata_probe_ent *probe_ent)
return
rc
;
}
/* move to PCI layer, integrate w/ MSI stuff */
static
void
pci_intx
(
struct
pci_dev
*
pdev
,
int
enable
)
{
u16
pci_command
,
new
;
pci_read_config_word
(
pdev
,
PCI_COMMAND
,
&
pci_command
);
if
(
enable
)
new
=
pci_command
&
~
PCI_COMMAND_INTX_DISABLE
;
else
new
=
pci_command
|
PCI_COMMAND_INTX_DISABLE
;
if
(
new
!=
pci_command
)
pci_write_config_word
(
pdev
,
PCI_COMMAND
,
pci_command
);
}
static
int
mv_init_one
(
struct
pci_dev
*
pdev
,
const
struct
pci_device_id
*
ent
)
{
static
int
printed_version
=
0
;
...
...
drivers/scsi/sata_sis.c
View file @
5f502413
...
...
@@ -147,11 +147,13 @@ static unsigned int get_scr_cfg_addr(unsigned int port_no, unsigned int sc_reg,
{
unsigned
int
addr
=
SIS_SCR_BASE
+
(
4
*
sc_reg
);
if
(
port_no
)
if
(
port_no
)
{
if
(
device
==
0x182
)
addr
+=
SIS182_SATA1_OFS
;
else
addr
+=
SIS180_SATA1_OFS
;
}
return
addr
;
}
...
...
@@ -195,7 +197,7 @@ static void sis_scr_cfg_write (struct ata_port *ap, unsigned int scr, u32 val)
static
u32
sis_scr_read
(
struct
ata_port
*
ap
,
unsigned
int
sc_reg
)
{
struct
pci_dev
*
pdev
=
to_pci_dev
(
ap
->
host_set
->
dev
);
u32
val
,
val2
;
u32
val
,
val2
=
0
;
u8
pmr
;
if
(
sc_reg
>
SCR_CONTROL
)
...
...
@@ -209,9 +211,9 @@ static u32 sis_scr_read (struct ata_port *ap, unsigned int sc_reg)
val
=
inl
(
ap
->
ioaddr
.
scr_addr
+
(
sc_reg
*
4
));
if
((
pdev
->
device
==
0x182
)
||
(
pmr
&
SIS_PMR_COMBINED
))
val2
=
inl
(
ap
->
ioaddr
.
scr_addr
+
(
sc_reg
*
4
)
+
0x10
);
val2
=
inl
(
ap
->
ioaddr
.
scr_addr
+
(
sc_reg
*
4
)
+
0x10
);
return
val
|
val2
;
return
val
|
val2
;
}
static
void
sis_scr_write
(
struct
ata_port
*
ap
,
unsigned
int
sc_reg
,
u32
val
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment