Skip to content

Commit 7750d8b

Browse files
Ondrej ZaryDamien Le Moal
authored andcommitted
drivers/block: Remove PARIDE core and high-level protocols
Remove PARIDE core and high level protocols, taking care not to break low-level drivers (used by pata_parport). Also update documentation. Signed-off-by: Ondrej Zary <[email protected]> Acked-by: Jens Axboe <[email protected]> Signed-off-by: Damien Le Moal <[email protected]>
1 parent 246a1c4 commit 7750d8b

33 files changed

+110
-6354
lines changed

Documentation/admin-guide/blockdev/paride.rst

Lines changed: 78 additions & 362 deletions
Large diffs are not rendered by default.

Documentation/admin-guide/kernel-parameters.rst

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ parameter is applicable::
142142
NFS Appropriate NFS support is enabled.
143143
OF Devicetree is enabled.
144144
PV_OPS A paravirtualized kernel is enabled.
145-
PARIDE The ParIDE (parallel port IDE) subsystem is enabled.
146145
PARISC The PA-RISC architecture is enabled.
147146
PCI PCI bus support is enabled.
148147
PCIE PCI Express support is enabled.

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4120,10 +4120,6 @@
41204120

41214121
pcbit= [HW,ISDN]
41224122

4123-
pcd. [PARIDE]
4124-
See header of drivers/block/paride/pcd.c.
4125-
See also Documentation/admin-guide/blockdev/paride.rst.
4126-
41274123
pci=option[,option...] [PCI] various PCI subsystem options.
41284124

41294125
Some options herein operate on a specific device
@@ -4386,9 +4382,6 @@
43864382
for debug and development, but should not be
43874383
needed on a platform with proper driver support.
43884384

4389-
pd. [PARIDE]
4390-
See Documentation/admin-guide/blockdev/paride.rst.
4391-
43924385
pdcchassis= [PARISC,HW] Disable/Enable PDC Chassis Status codes at
43934386
boot time.
43944387
Format: { 0 | 1 }
@@ -4401,12 +4394,6 @@
44014394
allocator. This parameter is primarily for debugging
44024395
and performance comparison.
44034396

4404-
pf. [PARIDE]
4405-
See Documentation/admin-guide/blockdev/paride.rst.
4406-
4407-
pg. [PARIDE]
4408-
See Documentation/admin-guide/blockdev/paride.rst.
4409-
44104397
pirq= [SMP,APIC] Manual mp-table setup
44114398
See Documentation/x86/i386/IO-APIC.rst.
44124399

@@ -4568,9 +4555,6 @@
45684555

45694556
pstore.backend= Specify the name of the pstore backend to use
45704557

4571-
pt. [PARIDE]
4572-
See Documentation/admin-guide/blockdev/paride.rst.
4573-
45744558
pti= [X86-64] Control Page Table Isolation of user and
45754559
kernel address spaces. Disabling this feature
45764560
removes hardening, but improves performance of

MAINTAINERS

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15844,13 +15844,6 @@ F: arch/*/include/asm/paravirt*.h
1584415844
F: arch/*/kernel/paravirt*
1584515845
F: include/linux/hypervisor.h
1584615846

15847-
PARIDE DRIVERS FOR PARALLEL PORT IDE DEVICES
15848-
M: Tim Waugh <[email protected]>
15849-
L: [email protected] (subscribers-only)
15850-
S: Maintained
15851-
F: Documentation/admin-guide/blockdev/paride.rst
15852-
F: drivers/block/paride/
15853-
1585415847
PARISC ARCHITECTURE
1585515848
M: "James E.J. Bottomley" <[email protected]>
1585615849
M: Helge Deller <[email protected]>

drivers/ata/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1164,7 +1164,7 @@ config PATA_WINBOND_VLB
11641164

11651165
config PATA_PARPORT
11661166
tristate "Parallel port IDE device support"
1167-
depends on PARPORT_PC && PARIDE=n
1167+
depends on PARPORT_PC
11681168
help
11691169
There are many external CD-ROM and disk devices that connect through
11701170
your computer's parallel port. Most of them are actually IDE devices

drivers/block/Kconfig

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -103,33 +103,6 @@ config GDROM
103103
Most users will want to say "Y" here.
104104
You can also build this as a module which will be called gdrom.
105105

106-
config PARIDE
107-
tristate "Parallel port IDE device support"
108-
depends on PARPORT_PC
109-
help
110-
There are many external CD-ROM and disk devices that connect through
111-
your computer's parallel port. Most of them are actually IDE devices
112-
using a parallel port IDE adapter. This option enables the PARIDE
113-
subsystem which contains drivers for many of these external drives.
114-
Read <file:Documentation/admin-guide/blockdev/paride.rst> for more information.
115-
116-
If you have said Y to the "Parallel-port support" configuration
117-
option, you may share a single port between your printer and other
118-
parallel port devices. Answer Y to build PARIDE support into your
119-
kernel, or M if you would like to build it as a loadable module. If
120-
your parallel port support is in a loadable module, you must build
121-
PARIDE as a module. If you built PARIDE support into your kernel,
122-
you may still build the individual protocol modules and high-level
123-
drivers as loadable modules. If you build this support as a module,
124-
it will be called paride.
125-
126-
To use the PARIDE support, you must say Y or M here and also to at
127-
least one high-level driver (e.g. "Parallel port IDE disks",
128-
"Parallel port ATAPI CD-ROMs", "Parallel port ATAPI disks" etc.) and
129-
to at least one protocol driver (e.g. "ATEN EH-100 protocol",
130-
"MicroSolutions backpack protocol", "DataStor Commuter protocol"
131-
etc.).
132-
133106
source "drivers/block/paride/Kconfig"
134107

135108
source "drivers/block/mtip32xx/Kconfig"

drivers/block/paride/Kconfig

Lines changed: 16 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -1,102 +1,13 @@
11
# SPDX-License-Identifier: GPL-2.0
22
#
33
# PARIDE configuration
4-
#
5-
# PARIDE doesn't need PARPORT, but if PARPORT is configured as a module,
6-
# PARIDE must also be a module.
7-
# PARIDE only supports PC style parports. Tough for USB or other parports...
8-
9-
comment "Parallel IDE high-level drivers"
10-
depends on PARIDE
11-
12-
config PARIDE_PD
13-
tristate "Parallel port IDE disks"
14-
depends on PARIDE
15-
help
16-
This option enables the high-level driver for IDE-type disk devices
17-
connected through a parallel port. If you chose to build PARIDE
18-
support into your kernel, you may answer Y here to build in the
19-
parallel port IDE driver, otherwise you should answer M to build
20-
it as a loadable module. The module will be called pd. You
21-
must also have at least one parallel port protocol driver in your
22-
system. Among the devices supported by this driver are the SyQuest
23-
EZ-135, EZ-230 and SparQ drives, the Avatar Shark and the backpack
24-
hard drives from MicroSolutions.
25-
26-
config PARIDE_PCD
27-
tristate "Parallel port ATAPI CD-ROMs"
28-
depends on PARIDE
29-
select CDROM
30-
help
31-
This option enables the high-level driver for ATAPI CD-ROM devices
32-
connected through a parallel port. If you chose to build PARIDE
33-
support into your kernel, you may answer Y here to build in the
34-
parallel port ATAPI CD-ROM driver, otherwise you should answer M to
35-
build it as a loadable module. The module will be called pcd. You
36-
must also have at least one parallel port protocol driver in your
37-
system. Among the devices supported by this driver are the
38-
MicroSolutions backpack CD-ROM drives and the Freecom Power CD. If
39-
you have such a CD-ROM drive, you should also say Y or M to "ISO
40-
9660 CD-ROM file system support" below, because that's the file
41-
system used on CD-ROMs.
42-
43-
config PARIDE_PF
44-
tristate "Parallel port ATAPI disks"
45-
depends on PARIDE
46-
help
47-
This option enables the high-level driver for ATAPI disk devices
48-
connected through a parallel port. If you chose to build PARIDE
49-
support into your kernel, you may answer Y here to build in the
50-
parallel port ATAPI disk driver, otherwise you should answer M
51-
to build it as a loadable module. The module will be called pf.
52-
You must also have at least one parallel port protocol driver in
53-
your system. Among the devices supported by this driver are the
54-
MicroSolutions backpack PD/CD drive and the Imation Superdisk
55-
LS-120 drive.
56-
57-
config PARIDE_PT
58-
tristate "Parallel port ATAPI tapes"
59-
depends on PARIDE
60-
help
61-
This option enables the high-level driver for ATAPI tape devices
62-
connected through a parallel port. If you chose to build PARIDE
63-
support into your kernel, you may answer Y here to build in the
64-
parallel port ATAPI disk driver, otherwise you should answer M
65-
to build it as a loadable module. The module will be called pt.
66-
You must also have at least one parallel port protocol driver in
67-
your system. Among the devices supported by this driver is the
68-
parallel port version of the HP 5GB drive.
69-
70-
config PARIDE_PG
71-
tristate "Parallel port generic ATAPI devices"
72-
depends on PARIDE
73-
help
74-
This option enables a special high-level driver for generic ATAPI
75-
devices connected through a parallel port. The driver allows user
76-
programs, such as cdrtools, to send ATAPI commands directly to a
77-
device.
78-
79-
If you chose to build PARIDE support into your kernel, you may
80-
answer Y here to build in the parallel port generic ATAPI driver,
81-
otherwise you should answer M to build it as a loadable module. The
82-
module will be called pg.
83-
84-
You must also have at least one parallel port protocol driver in
85-
your system.
86-
87-
This driver implements an API loosely related to the generic SCSI
88-
driver. See <file:include/linux/pg.h>. for details.
89-
90-
You can obtain the most recent version of cdrtools from
91-
<ftp://ftp.berlios.de/pub/cdrecord/>. Versions 1.6.1a3 and
92-
later fully support this driver.
934

945
comment "Parallel IDE protocol modules"
95-
depends on PARIDE || PATA_PARPORT
6+
depends on PATA_PARPORT
967

978
config PARIDE_ATEN
989
tristate "ATEN EH-100 protocol"
99-
depends on PARIDE || PATA_PARPORT
10+
depends on PATA_PARPORT
10011
help
10112
This option enables support for the ATEN EH-100 parallel port IDE
10213
protocol. This protocol is used in some inexpensive low performance
@@ -109,7 +20,7 @@ config PARIDE_ATEN
10920

11021
config PARIDE_BPCK
11122
tristate "MicroSolutions backpack (Series 5) protocol"
112-
depends on PARIDE || PATA_PARPORT
23+
depends on PATA_PARPORT
11324
help
11425
This option enables support for the Micro Solutions BACKPACK
11526
parallel port Series 5 IDE protocol. (Most BACKPACK drives made
@@ -127,7 +38,7 @@ config PARIDE_BPCK
12738

12839
config PARIDE_BPCK6
12940
tristate "MicroSolutions backpack (Series 6) protocol"
130-
depends on (PARIDE || PATA_PARPORT) && !64BIT
41+
depends on (PATA_PARPORT) && !64BIT
13142
help
13243
This option enables support for the Micro Solutions BACKPACK
13344
parallel port Series 6 IDE protocol. (Most BACKPACK drives made
@@ -146,7 +57,7 @@ config PARIDE_BPCK6
14657

14758
config PARIDE_COMM
14859
tristate "DataStor Commuter protocol"
149-
depends on PARIDE || PATA_PARPORT
60+
depends on PATA_PARPORT
15061
help
15162
This option enables support for the Commuter parallel port IDE
15263
protocol from DataStor. If you chose to build PARIDE support
@@ -157,7 +68,7 @@ config PARIDE_COMM
15768

15869
config PARIDE_DSTR
15970
tristate "DataStor EP-2000 protocol"
160-
depends on PARIDE || PATA_PARPORT
71+
depends on PATA_PARPORT
16172
help
16273
This option enables support for the EP-2000 parallel port IDE
16374
protocol from DataStor. If you chose to build PARIDE support
@@ -168,7 +79,7 @@ config PARIDE_DSTR
16879

16980
config PARIDE_FIT2
17081
tristate "FIT TD-2000 protocol"
171-
depends on PARIDE || PATA_PARPORT
82+
depends on PATA_PARPORT
17283
help
17384
This option enables support for the TD-2000 parallel port IDE
17485
protocol from Fidelity International Technology. This is a simple
@@ -181,7 +92,7 @@ config PARIDE_FIT2
18192

18293
config PARIDE_FIT3
18394
tristate "FIT TD-3000 protocol"
184-
depends on PARIDE || PATA_PARPORT
95+
depends on PATA_PARPORT
18596
help
18697
This option enables support for the TD-3000 parallel port IDE
18798
protocol from Fidelity International Technology. This protocol is
@@ -194,7 +105,7 @@ config PARIDE_FIT3
194105

195106
config PARIDE_EPAT
196107
tristate "Shuttle EPAT/EPEZ protocol"
197-
depends on PARIDE || PATA_PARPORT
108+
depends on PATA_PARPORT
198109
help
199110
This option enables support for the EPAT parallel port IDE protocol.
200111
EPAT is a parallel port IDE adapter manufactured by Shuttle
@@ -216,7 +127,7 @@ config PARIDE_EPATC8
216127

217128
config PARIDE_EPIA
218129
tristate "Shuttle EPIA protocol"
219-
depends on PARIDE || PATA_PARPORT
130+
depends on PATA_PARPORT
220131
help
221132
This option enables support for the (obsolete) EPIA parallel port
222133
IDE protocol from Shuttle Technology. This adapter can still be
@@ -228,7 +139,7 @@ config PARIDE_EPIA
228139

229140
config PARIDE_FRIQ
230141
tristate "Freecom IQ ASIC-2 protocol"
231-
depends on PARIDE || PATA_PARPORT
142+
depends on PATA_PARPORT
232143
help
233144
This option enables support for version 2 of the Freecom IQ parallel
234145
port IDE adapter. This adapter is used by the Maxell Superdisk
@@ -240,7 +151,7 @@ config PARIDE_FRIQ
240151

241152
config PARIDE_FRPW
242153
tristate "FreeCom power protocol"
243-
depends on PARIDE || PATA_PARPORT
154+
depends on PATA_PARPORT
244155
help
245156
This option enables support for the Freecom power parallel port IDE
246157
protocol. If you chose to build PARIDE support into your kernel, you
@@ -251,7 +162,7 @@ config PARIDE_FRPW
251162

252163
config PARIDE_KBIC
253164
tristate "KingByte KBIC-951A/971A protocols"
254-
depends on PARIDE || PATA_PARPORT
165+
depends on PATA_PARPORT
255166
help
256167
This option enables support for the KBIC-951A and KBIC-971A parallel
257168
port IDE protocols from KingByte Information Corp. KingByte's
@@ -264,7 +175,7 @@ config PARIDE_KBIC
264175

265176
config PARIDE_KTTI
266177
tristate "KT PHd protocol"
267-
depends on PARIDE || PATA_PARPORT
178+
depends on PATA_PARPORT
268179
help
269180
This option enables support for the "PHd" parallel port IDE protocol
270181
from KT Technology. This is a simple (low speed) adapter that is
@@ -277,7 +188,7 @@ config PARIDE_KTTI
277188

278189
config PARIDE_ON20
279190
tristate "OnSpec 90c20 protocol"
280-
depends on PARIDE || PATA_PARPORT
191+
depends on PATA_PARPORT
281192
help
282193
This option enables support for the (obsolete) 90c20 parallel port
283194
IDE protocol from OnSpec (often marketed under the ValuStore brand
@@ -289,7 +200,7 @@ config PARIDE_ON20
289200

290201
config PARIDE_ON26
291202
tristate "OnSpec 90c26 protocol"
292-
depends on PARIDE || PATA_PARPORT
203+
depends on PATA_PARPORT
293204
help
294205
This option enables support for the 90c26 parallel port IDE protocol
295206
from OnSpec Electronics (often marketed under the ValuStore brand

drivers/block/paride/Makefile

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
# Rewritten to use lists instead of if-statements.
77
#
88

9-
obj-$(CONFIG_PARIDE) += paride.o
109
obj-$(CONFIG_PARIDE_ATEN) += aten.o
1110
obj-$(CONFIG_PARIDE_BPCK) += bpck.o
1211
obj-$(CONFIG_PARIDE_COMM) += comm.o
@@ -22,8 +21,3 @@ obj-$(CONFIG_PARIDE_ON20) += on20.o
2221
obj-$(CONFIG_PARIDE_ON26) += on26.o
2322
obj-$(CONFIG_PARIDE_KTTI) += ktti.o
2423
obj-$(CONFIG_PARIDE_BPCK6) += bpck6.o
25-
obj-$(CONFIG_PARIDE_PD) += pd.o
26-
obj-$(CONFIG_PARIDE_PCD) += pcd.o
27-
obj-$(CONFIG_PARIDE_PF) += pf.o
28-
obj-$(CONFIG_PARIDE_PT) += pt.o
29-
obj-$(CONFIG_PARIDE_PG) += pg.o

0 commit comments

Comments
 (0)