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
5c26f69d
Commit
5c26f69d
authored
Aug 22, 2004
by
Russell King
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PCMCIA] Remove pccard_mem_map's sys_start and sys_stop elements.
parent
e57a9192
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
5 additions
and
21 deletions
+5
-21
drivers/pcmcia/cistpl.c
drivers/pcmcia/cistpl.c
+0
-2
drivers/pcmcia/cs.c
drivers/pcmcia/cs.c
+0
-7
drivers/pcmcia/i82092.c
drivers/pcmcia/i82092.c
+1
-1
drivers/pcmcia/i82365.c
drivers/pcmcia/i82365.c
+1
-1
drivers/pcmcia/pd6729.c
drivers/pcmcia/pd6729.c
+1
-1
drivers/pcmcia/rsrc_mgr.c
drivers/pcmcia/rsrc_mgr.c
+0
-6
drivers/pcmcia/tcic.c
drivers/pcmcia/tcic.c
+1
-1
drivers/pcmcia/yenta_socket.c
drivers/pcmcia/yenta_socket.c
+1
-1
include/pcmcia/ss.h
include/pcmcia/ss.h
+0
-1
No files found.
drivers/pcmcia/cistpl.c
View file @
5c26f69d
...
@@ -114,8 +114,6 @@ set_cis_map(struct pcmcia_socket *s, unsigned int card_offset, unsigned int flag
...
@@ -114,8 +114,6 @@ set_cis_map(struct pcmcia_socket *s, unsigned int card_offset, unsigned int flag
printk
(
KERN_NOTICE
"cs: unable to map card memory!
\n
"
);
printk
(
KERN_NOTICE
"cs: unable to map card memory!
\n
"
);
return
NULL
;
return
NULL
;
}
}
mem
->
sys_start
=
mem
->
res
->
start
;
mem
->
sys_stop
=
mem
->
res
->
end
;
s
->
cis_virt
=
ioremap
(
mem
->
res
->
start
,
s
->
map_size
);
s
->
cis_virt
=
ioremap
(
mem
->
res
->
start
,
s
->
map_size
);
}
}
mem
->
card_start
=
card_offset
;
mem
->
card_start
=
card_offset
;
...
...
drivers/pcmcia/cs.c
View file @
5c26f69d
...
@@ -1886,11 +1886,6 @@ int pcmcia_request_window(client_handle_t *handle, win_req_t *req, window_handle
...
@@ -1886,11 +1886,6 @@ int pcmcia_request_window(client_handle_t *handle, win_req_t *req, window_handle
(
*
handle
)
->
dev_info
,
s
);
(
*
handle
)
->
dev_info
,
s
);
if
(
!
win
->
ctl
.
res
)
if
(
!
win
->
ctl
.
res
)
return
CS_IN_USE
;
return
CS_IN_USE
;
win
->
ctl
.
sys_start
=
win
->
ctl
.
res
->
start
;
win
->
ctl
.
sys_stop
=
win
->
ctl
.
res
->
end
;
}
else
{
win
->
ctl
.
sys_start
=
req
->
Base
;
win
->
ctl
.
sys_stop
=
req
->
Base
+
req
->
Size
-
1
;
}
}
(
*
handle
)
->
state
|=
CLIENT_WIN_REQ
(
w
);
(
*
handle
)
->
state
|=
CLIENT_WIN_REQ
(
w
);
...
@@ -1914,8 +1909,6 @@ int pcmcia_request_window(client_handle_t *handle, win_req_t *req, window_handle
...
@@ -1914,8 +1909,6 @@ int pcmcia_request_window(client_handle_t *handle, win_req_t *req, window_handle
/* Return window handle */
/* Return window handle */
if
(
s
->
features
&
SS_CAP_STATIC_MAP
)
{
if
(
s
->
features
&
SS_CAP_STATIC_MAP
)
{
req
->
Base
=
win
->
ctl
.
static_start
;
req
->
Base
=
win
->
ctl
.
static_start
;
win
->
ctl
.
sys_start
=
req
->
Base
;
win
->
ctl
.
sys_stop
=
req
->
Base
+
req
->
Size
-
1
;
}
else
{
}
else
{
req
->
Base
=
win
->
ctl
.
res
->
start
;
req
->
Base
=
win
->
ctl
.
res
->
start
;
}
}
...
...
drivers/pcmcia/i82092.c
View file @
5c26f69d
...
@@ -422,7 +422,7 @@ static int i82092aa_init(struct pcmcia_socket *sock)
...
@@ -422,7 +422,7 @@ static int i82092aa_init(struct pcmcia_socket *sock)
int
i
;
int
i
;
struct
resource
res
=
{
.
start
=
0
,
.
end
=
0x0fff
};
struct
resource
res
=
{
.
start
=
0
,
.
end
=
0x0fff
};
pccard_io_map
io
=
{
0
,
0
,
0
,
0
,
1
};
pccard_io_map
io
=
{
0
,
0
,
0
,
0
,
1
};
pccard_mem_map
mem
=
{
.
res
=
&
res
,
.
sys_stop
=
0x0fff
,
};
pccard_mem_map
mem
=
{
.
res
=
&
res
,
};
enter
(
"i82092aa_init"
);
enter
(
"i82092aa_init"
);
...
...
drivers/pcmcia/i82365.c
View file @
5c26f69d
...
@@ -1309,7 +1309,7 @@ static int pcic_init(struct pcmcia_socket *s)
...
@@ -1309,7 +1309,7 @@ static int pcic_init(struct pcmcia_socket *s)
int
i
;
int
i
;
struct
resource
res
=
{
.
start
=
0
,
.
end
=
0x1000
};
struct
resource
res
=
{
.
start
=
0
,
.
end
=
0x1000
};
pccard_io_map
io
=
{
0
,
0
,
0
,
0
,
1
};
pccard_io_map
io
=
{
0
,
0
,
0
,
0
,
1
};
pccard_mem_map
mem
=
{
.
res
=
&
res
,
.
sys_stop
=
0x1000
,
};
pccard_mem_map
mem
=
{
.
res
=
&
res
,
};
for
(
i
=
0
;
i
<
2
;
i
++
)
{
for
(
i
=
0
;
i
<
2
;
i
++
)
{
io
.
map
=
i
;
io
.
map
=
i
;
...
...
drivers/pcmcia/pd6729.c
View file @
5c26f69d
...
@@ -577,7 +577,7 @@ static int pd6729_init(struct pcmcia_socket *sock)
...
@@ -577,7 +577,7 @@ static int pd6729_init(struct pcmcia_socket *sock)
int
i
;
int
i
;
struct
resource
res
=
{
.
end
=
0x0fff
};
struct
resource
res
=
{
.
end
=
0x0fff
};
pccard_io_map
io
=
{
0
,
0
,
0
,
0
,
1
};
pccard_io_map
io
=
{
0
,
0
,
0
,
0
,
1
};
pccard_mem_map
mem
=
{
.
res
=
&
res
,
.
sys_stop
=
0x0fff
};
pccard_mem_map
mem
=
{
.
res
=
&
res
,
};
pd6729_set_socket
(
sock
,
&
dead_socket
);
pd6729_set_socket
(
sock
,
&
dead_socket
);
for
(
i
=
0
;
i
<
2
;
i
++
)
{
for
(
i
=
0
;
i
<
2
;
i
++
)
{
...
...
drivers/pcmcia/rsrc_mgr.c
View file @
5c26f69d
...
@@ -301,8 +301,6 @@ static int readable(struct pcmcia_socket *s, struct resource *res, cisinfo_t *in
...
@@ -301,8 +301,6 @@ static int readable(struct pcmcia_socket *s, struct resource *res, cisinfo_t *in
{
{
int
ret
=
-
1
;
int
ret
=
-
1
;
s
->
cis_mem
.
sys_start
=
res
->
start
;
s
->
cis_mem
.
sys_stop
=
res
->
end
;
s
->
cis_mem
.
res
=
res
;
s
->
cis_mem
.
res
=
res
;
s
->
cis_virt
=
ioremap
(
res
->
start
,
s
->
map_size
);
s
->
cis_virt
=
ioremap
(
res
->
start
,
s
->
map_size
);
if
(
s
->
cis_virt
)
{
if
(
s
->
cis_virt
)
{
...
@@ -312,8 +310,6 @@ static int readable(struct pcmcia_socket *s, struct resource *res, cisinfo_t *in
...
@@ -312,8 +310,6 @@ static int readable(struct pcmcia_socket *s, struct resource *res, cisinfo_t *in
s
->
cis_virt
=
NULL
;
s
->
cis_virt
=
NULL
;
destroy_cis_cache
(
s
);
destroy_cis_cache
(
s
);
}
}
s
->
cis_mem
.
sys_start
=
0
;
s
->
cis_mem
.
sys_stop
=
0
;
s
->
cis_mem
.
res
=
NULL
;
s
->
cis_mem
.
res
=
NULL
;
if
((
ret
!=
0
)
||
(
info
->
Chains
==
0
))
if
((
ret
!=
0
)
||
(
info
->
Chains
==
0
))
return
0
;
return
0
;
...
@@ -332,8 +328,6 @@ static int checksum(struct pcmcia_socket *s, struct resource *res)
...
@@ -332,8 +328,6 @@ static int checksum(struct pcmcia_socket *s, struct resource *res)
map
.
map
=
0
;
map
.
map
=
0
;
map
.
flags
=
MAP_ACTIVE
;
map
.
flags
=
MAP_ACTIVE
;
map
.
speed
=
0
;
map
.
speed
=
0
;
map
.
sys_start
=
res
->
start
;
map
.
sys_stop
=
res
->
end
;
map
.
res
=
res
;
map
.
res
=
res
;
map
.
card_start
=
0
;
map
.
card_start
=
0
;
s
->
ops
->
set_mem_map
(
s
,
&
map
);
s
->
ops
->
set_mem_map
(
s
,
&
map
);
...
...
drivers/pcmcia/tcic.c
View file @
5c26f69d
...
@@ -870,7 +870,7 @@ static int tcic_init(struct pcmcia_socket *s)
...
@@ -870,7 +870,7 @@ static int tcic_init(struct pcmcia_socket *s)
int
i
;
int
i
;
struct
resource
res
=
{
.
start
=
0
,
.
end
=
0x1000
};
struct
resource
res
=
{
.
start
=
0
,
.
end
=
0x1000
};
pccard_io_map
io
=
{
0
,
0
,
0
,
0
,
1
};
pccard_io_map
io
=
{
0
,
0
,
0
,
0
,
1
};
pccard_mem_map
mem
=
{
.
res
=
&
res
,
.
sys_stop
=
0x1000
,
};
pccard_mem_map
mem
=
{
.
res
=
&
res
,
};
for
(
i
=
0
;
i
<
2
;
i
++
)
{
for
(
i
=
0
;
i
<
2
;
i
++
)
{
io
.
map
=
i
;
io
.
map
=
i
;
...
...
drivers/pcmcia/yenta_socket.c
View file @
5c26f69d
...
@@ -450,7 +450,7 @@ static void yenta_clear_maps(struct yenta_socket *socket)
...
@@ -450,7 +450,7 @@ static void yenta_clear_maps(struct yenta_socket *socket)
int
i
;
int
i
;
struct
resource
res
=
{
.
start
=
0
,
.
end
=
0x0fff
};
struct
resource
res
=
{
.
start
=
0
,
.
end
=
0x0fff
};
pccard_io_map
io
=
{
0
,
0
,
0
,
0
,
1
};
pccard_io_map
io
=
{
0
,
0
,
0
,
0
,
1
};
pccard_mem_map
mem
=
{
.
res
=
&
res
,
.
sys_stop
=
0x0fff
,
};
pccard_mem_map
mem
=
{
.
res
=
&
res
,
};
yenta_set_socket
(
&
socket
->
socket
,
&
dead_socket
);
yenta_set_socket
(
&
socket
->
socket
,
&
dead_socket
);
for
(
i
=
0
;
i
<
2
;
i
++
)
{
for
(
i
=
0
;
i
<
2
;
i
++
)
{
...
...
include/pcmcia/ss.h
View file @
5c26f69d
...
@@ -103,7 +103,6 @@ typedef struct pccard_mem_map {
...
@@ -103,7 +103,6 @@ typedef struct pccard_mem_map {
u_char
map
;
u_char
map
;
u_char
flags
;
u_char
flags
;
u_short
speed
;
u_short
speed
;
u_long
sys_start
,
sys_stop
;
u_long
static_start
;
u_long
static_start
;
u_int
card_start
;
u_int
card_start
;
struct
resource
*
res
;
struct
resource
*
res
;
...
...
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