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
b39472ce
Commit
b39472ce
authored
Sep 21, 2002
by
Alexander Viro
Committed by
Linus Torvalds
Sep 21, 2002
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[PATCH] gendisk for sbpcd
sbpcd switched to use of gendisk
parent
f52c3034
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
1 deletion
+15
-1
drivers/cdrom/sbpcd.c
drivers/cdrom/sbpcd.c
+15
-1
No files found.
drivers/cdrom/sbpcd.c
View file @
b39472ce
...
@@ -722,7 +722,7 @@ static struct sbpcd_drive {
...
@@ -722,7 +722,7 @@ static struct sbpcd_drive {
u_char
mode_xb_8
;
u_char
mode_xb_8
;
u_char
delay
;
u_char
delay
;
struct
cdrom_device_info
*
sbpcd_infop
;
struct
cdrom_device_info
*
sbpcd_infop
;
struct
gendisk
disk
;
}
D_S
[
NR_SBPCD
];
}
D_S
[
NR_SBPCD
];
static
struct
sbpcd_drive
*
current_drive
=
D_S
;
static
struct
sbpcd_drive
*
current_drive
=
D_S
;
...
@@ -5777,6 +5777,7 @@ int __init sbpcd_init(void)
...
@@ -5777,6 +5777,7 @@ int __init sbpcd_init(void)
for
(
j
=
0
;
j
<
NR_SBPCD
;
j
++
)
for
(
j
=
0
;
j
<
NR_SBPCD
;
j
++
)
{
{
struct
cdrom_device_info
*
sbpcd_infop
;
struct
cdrom_device_info
*
sbpcd_infop
;
struct
gendisk
*
disk
;
struct
sbpcd_drive
*
p
=
D_S
+
j
;
struct
sbpcd_drive
*
p
=
D_S
+
j
;
if
(
p
->
drv_id
==-
1
)
continue
;
if
(
p
->
drv_id
==-
1
)
continue
;
...
@@ -5829,6 +5830,12 @@ int __init sbpcd_init(void)
...
@@ -5829,6 +5830,12 @@ int __init sbpcd_init(void)
sbpcd_infop
->
dev
=
mk_kdev
(
MAJOR_NR
,
j
);
sbpcd_infop
->
dev
=
mk_kdev
(
MAJOR_NR
,
j
);
sbpcd_infop
->
handle
=
p
;
sbpcd_infop
->
handle
=
p
;
p
->
sbpcd_infop
=
sbpcd_infop
;
p
->
sbpcd_infop
=
sbpcd_infop
;
disk
=
&
p
->
disk
;
disk
->
major
=
MAJOR_NR
;
disk
->
first_minor
=
j
;
disk
->
minor_shift
=
0
;
disk
->
fops
=
&
sbpcd_bdops
;
disk
->
major_name
=
sbpcd_infop
->
name
;
sprintf
(
nbuff
,
"c0t%d/cd"
,
p
->
drv_id
);
sprintf
(
nbuff
,
"c0t%d/cd"
,
p
->
drv_id
);
sbpcd_infop
->
de
=
sbpcd_infop
->
de
=
devfs_register
(
devfs_handle
,
nbuff
,
DEVFS_FL_DEFAULT
,
devfs_register
(
devfs_handle
,
nbuff
,
DEVFS_FL_DEFAULT
,
...
@@ -5838,6 +5845,12 @@ int __init sbpcd_init(void)
...
@@ -5838,6 +5845,12 @@ int __init sbpcd_init(void)
{
{
printk
(
" sbpcd: Unable to register with Uniform CD-ROm driver
\n
"
);
printk
(
" sbpcd: Unable to register with Uniform CD-ROm driver
\n
"
);
}
}
add_gendisk
(
disk
);
register_disk
(
disk
,
mk_kdev
(
disk
->
major
,
disk
->
first_minor
),
1
<<
disk
->
minor_shift
,
disk
->
fops
,
0
);
}
}
blk_queue_hardsect_size
(
BLK_DEFAULT_QUEUE
(
MAJOR_NR
),
CD_FRAMESIZE
);
blk_queue_hardsect_size
(
BLK_DEFAULT_QUEUE
(
MAJOR_NR
),
CD_FRAMESIZE
);
...
@@ -5863,6 +5876,7 @@ void sbpcd_exit(void)
...
@@ -5863,6 +5876,7 @@ void sbpcd_exit(void)
for
(
j
=
0
;
j
<
NR_SBPCD
;
j
++
)
for
(
j
=
0
;
j
<
NR_SBPCD
;
j
++
)
{
{
if
(
D_S
[
j
].
drv_id
==-
1
)
continue
;
if
(
D_S
[
j
].
drv_id
==-
1
)
continue
;
del_gendisk
(
&
D_S
[
j
].
disk
);
vfree
(
D_S
[
j
].
sbp_buf
);
vfree
(
D_S
[
j
].
sbp_buf
);
if
(
D_S
[
j
].
sbp_audsiz
>
0
)
vfree
(
D_S
[
j
].
aud_buf
);
if
(
D_S
[
j
].
sbp_audsiz
>
0
)
vfree
(
D_S
[
j
].
aud_buf
);
if
((
unregister_cdrom
(
D_S
[
j
].
sbpcd_infop
)
==
-
EINVAL
))
if
((
unregister_cdrom
(
D_S
[
j
].
sbpcd_infop
)
==
-
EINVAL
))
...
...
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