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
nexedi
linux
Commits
c15fcafe
Commit
c15fcafe
authored
Oct 14, 2007
by
Al Viro
Committed by
Jeff Garzik
Oct 25, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix pata_icside build for recent libata API changes
Signed-off-by:
Jeff Garzik
<
jeff@garzik.org
>
parent
0e06d9ce
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
22 additions
and
20 deletions
+22
-20
drivers/ata/pata_icside.c
drivers/ata/pata_icside.c
+22
-20
No files found.
drivers/ata/pata_icside.c
View file @
c15fcafe
...
@@ -332,12 +332,13 @@ static void ata_dummy_noret(struct ata_port *port)
...
@@ -332,12 +332,13 @@ static void ata_dummy_noret(struct ata_port *port)
{
{
}
}
static
void
pata_icside_postreset
(
struct
ata_
port
*
ap
,
unsigned
int
*
classes
)
static
void
pata_icside_postreset
(
struct
ata_
link
*
link
,
unsigned
int
*
classes
)
{
{
struct
ata_port
*
ap
=
link
->
ap
;
struct
pata_icside_state
*
state
=
ap
->
host
->
private_data
;
struct
pata_icside_state
*
state
=
ap
->
host
->
private_data
;
if
(
classes
[
0
]
!=
ATA_DEV_NONE
||
classes
[
1
]
!=
ATA_DEV_NONE
)
if
(
classes
[
0
]
!=
ATA_DEV_NONE
||
classes
[
1
]
!=
ATA_DEV_NONE
)
return
ata_std_postreset
(
ap
,
classes
);
return
ata_std_postreset
(
link
,
classes
);
state
->
port
[
ap
->
port_no
].
disabled
=
1
;
state
->
port
[
ap
->
port_no
].
disabled
=
1
;
...
@@ -395,29 +396,30 @@ static struct ata_port_operations pata_icside_port_ops = {
...
@@ -395,29 +396,30 @@ static struct ata_port_operations pata_icside_port_ops = {
static
void
__devinit
static
void
__devinit
pata_icside_setup_ioaddr
(
struct
ata_port
*
ap
,
void
__iomem
*
base
,
pata_icside_setup_ioaddr
(
struct
ata_port
*
ap
,
void
__iomem
*
base
,
const
struct
portinfo
*
info
)
struct
pata_icside_info
*
info
,
const
struct
portinfo
*
port
)
{
{
struct
ata_ioports
*
ioaddr
=
&
ap
->
ioaddr
;
struct
ata_ioports
*
ioaddr
=
&
ap
->
ioaddr
;
void
__iomem
*
cmd
=
base
+
info
->
dataoffset
;
void
__iomem
*
cmd
=
base
+
port
->
dataoffset
;
ioaddr
->
cmd_addr
=
cmd
;
ioaddr
->
cmd_addr
=
cmd
;
ioaddr
->
data_addr
=
cmd
+
(
ATA_REG_DATA
<<
info
->
stepping
);
ioaddr
->
data_addr
=
cmd
+
(
ATA_REG_DATA
<<
port
->
stepping
);
ioaddr
->
error_addr
=
cmd
+
(
ATA_REG_ERR
<<
info
->
stepping
);
ioaddr
->
error_addr
=
cmd
+
(
ATA_REG_ERR
<<
port
->
stepping
);
ioaddr
->
feature_addr
=
cmd
+
(
ATA_REG_FEATURE
<<
info
->
stepping
);
ioaddr
->
feature_addr
=
cmd
+
(
ATA_REG_FEATURE
<<
port
->
stepping
);
ioaddr
->
nsect_addr
=
cmd
+
(
ATA_REG_NSECT
<<
info
->
stepping
);
ioaddr
->
nsect_addr
=
cmd
+
(
ATA_REG_NSECT
<<
port
->
stepping
);
ioaddr
->
lbal_addr
=
cmd
+
(
ATA_REG_LBAL
<<
info
->
stepping
);
ioaddr
->
lbal_addr
=
cmd
+
(
ATA_REG_LBAL
<<
port
->
stepping
);
ioaddr
->
lbam_addr
=
cmd
+
(
ATA_REG_LBAM
<<
info
->
stepping
);
ioaddr
->
lbam_addr
=
cmd
+
(
ATA_REG_LBAM
<<
port
->
stepping
);
ioaddr
->
lbah_addr
=
cmd
+
(
ATA_REG_LBAH
<<
info
->
stepping
);
ioaddr
->
lbah_addr
=
cmd
+
(
ATA_REG_LBAH
<<
port
->
stepping
);
ioaddr
->
device_addr
=
cmd
+
(
ATA_REG_DEVICE
<<
info
->
stepping
);
ioaddr
->
device_addr
=
cmd
+
(
ATA_REG_DEVICE
<<
port
->
stepping
);
ioaddr
->
status_addr
=
cmd
+
(
ATA_REG_STATUS
<<
info
->
stepping
);
ioaddr
->
status_addr
=
cmd
+
(
ATA_REG_STATUS
<<
port
->
stepping
);
ioaddr
->
command_addr
=
cmd
+
(
ATA_REG_CMD
<<
info
->
stepping
);
ioaddr
->
command_addr
=
cmd
+
(
ATA_REG_CMD
<<
port
->
stepping
);
ioaddr
->
ctl_addr
=
base
+
info
->
ctrloffset
;
ioaddr
->
ctl_addr
=
base
+
port
->
ctrloffset
;
ioaddr
->
altstatus_addr
=
ioaddr
->
ctl_addr
;
ioaddr
->
altstatus_addr
=
ioaddr
->
ctl_addr
;
ata_port_desc
(
ap
,
"cmd 0x%lx ctl 0x%lx"
,
ata_port_desc
(
ap
,
"cmd 0x%lx ctl 0x%lx"
,
info
->
raw_base
+
info
->
dataoffset
,
info
->
raw_base
+
port
->
dataoffset
,
info
->
raw_base
+
info
->
ctrloffset
);
info
->
raw_base
+
port
->
ctrloffset
);
if
(
info
->
raw_ioc_base
)
if
(
info
->
raw_ioc_base
)
ata_port_desc
(
ap
,
"iocbase 0x%lx"
,
info
->
raw_ioc_base
);
ata_port_desc
(
ap
,
"iocbase 0x%lx"
,
info
->
raw_ioc_base
);
...
@@ -441,7 +443,7 @@ static int __devinit pata_icside_register_v5(struct pata_icside_info *info)
...
@@ -441,7 +443,7 @@ static int __devinit pata_icside_register_v5(struct pata_icside_info *info)
info
->
nr_ports
=
1
;
info
->
nr_ports
=
1
;
info
->
port
[
0
]
=
&
pata_icside_portinfo_v5
;
info
->
port
[
0
]
=
&
pata_icside_portinfo_v5
;
info
->
raw_base
=
ecard_resource_start
(
ec
,
ECARD_RES_MEMC
);
info
->
raw_base
=
ecard_resource_start
(
info
->
ec
,
ECARD_RES_MEMC
);
return
0
;
return
0
;
}
}
...
@@ -522,7 +524,7 @@ static int __devinit pata_icside_add_ports(struct pata_icside_info *info)
...
@@ -522,7 +524,7 @@ static int __devinit pata_icside_add_ports(struct pata_icside_info *info)
ap
->
flags
|=
ATA_FLAG_SLAVE_POSS
;
ap
->
flags
|=
ATA_FLAG_SLAVE_POSS
;
ap
->
ops
=
&
pata_icside_port_ops
;
ap
->
ops
=
&
pata_icside_port_ops
;
pata_icside_setup_ioaddr
(
ap
,
info
->
base
,
info
->
port
[
i
]);
pata_icside_setup_ioaddr
(
ap
,
info
->
base
,
info
,
info
->
port
[
i
]);
}
}
return
ata_host_activate
(
host
,
ec
->
irq
,
ata_interrupt
,
0
,
return
ata_host_activate
(
host
,
ec
->
irq
,
ata_interrupt
,
0
,
...
...
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