Skip to content

Commit c47946c

Browse files
Ondrej Zarymartinkpetersen
Ondrej Zary
authored and
martinkpetersen
committed
scsi: g_NCR5380: Remove deprecated __setup
Remove deprecated __setup for parsing command line parameters. g_NCR5380.* parameters could be used instead. This might break existing setups with g_NCR5380 built-in (if there are any). But it has to go in order to remove the overrides[] array. Signed-off-by: Ondrej Zary <linux@rainbow-software.org> Acked-by: Finn Thain <fthain@telegraphics.com.au> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1 parent 73811c9 commit c47946c

File tree

2 files changed

+0
-145
lines changed

2 files changed

+0
-145
lines changed

‎Documentation/scsi/g_NCR5380.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,6 @@ NCR53c400 card, the Trantor T130B in its default configuration:
2121
The NCR53c400 does not support DMA but it does have Pseudo-DMA which is
2222
supported by the driver.
2323

24-
If the default configuration does not work for you, you can use the kernel
25-
command lines (eg using the lilo append command):
26-
ncr5380=addr,irq
27-
ncr53c400=addr,irq
28-
ncr53c400a=addr,irq
29-
dtc3181e=addr,irq
30-
31-
The driver does not probe for any addresses or ports other than those in
32-
the OVERRIDE or given to the kernel as above.
33-
3424
This driver provides some information on what it has detected in
3525
/proc/scsi/g_NCR5380/x where x is the scsi card number as detected at boot
3626
time. More info to come in the future.

‎drivers/scsi/g_NCR5380.c

Lines changed: 0 additions & 135 deletions
Original file line numberDiff line numberDiff line change
@@ -56,136 +56,6 @@ static struct override {
5656

5757
#define NO_OVERRIDES ARRAY_SIZE(overrides)
5858

59-
#ifndef MODULE
60-
61-
/**
62-
* internal_setup - handle lilo command string override
63-
* @board: BOARD_* identifier for the board
64-
* @str: unused
65-
* @ints: numeric parameters
66-
*
67-
* Do LILO command line initialization of the overrides array. Display
68-
* errors when needed
69-
*
70-
* Locks: none
71-
*/
72-
73-
static void __init internal_setup(int board, char *str, int *ints)
74-
{
75-
static int commandline_current;
76-
switch (board) {
77-
case BOARD_NCR5380:
78-
if (ints[0] != 2 && ints[0] != 3) {
79-
printk(KERN_ERR "generic_NCR5380_setup : usage ncr5380=" STRVAL(NCR5380_map_name) ",irq,dma\n");
80-
return;
81-
}
82-
break;
83-
case BOARD_NCR53C400:
84-
if (ints[0] != 2) {
85-
printk(KERN_ERR "generic_NCR53C400_setup : usage ncr53c400=" STRVAL(NCR5380_map_name) ",irq\n");
86-
return;
87-
}
88-
break;
89-
case BOARD_NCR53C400A:
90-
if (ints[0] != 2) {
91-
printk(KERN_ERR "generic_NCR53C400A_setup : usage ncr53c400a=" STRVAL(NCR5380_map_name) ",irq\n");
92-
return;
93-
}
94-
break;
95-
case BOARD_DTC3181E:
96-
if (ints[0] != 2) {
97-
printk("generic_DTC3181E_setup : usage dtc3181e=" STRVAL(NCR5380_map_name) ",irq\n");
98-
return;
99-
}
100-
break;
101-
}
102-
103-
if (commandline_current < NO_OVERRIDES) {
104-
overrides[commandline_current].NCR5380_map_name = (NCR5380_map_type) ints[1];
105-
overrides[commandline_current].irq = ints[2];
106-
if (ints[0] == 3)
107-
overrides[commandline_current].dma = ints[3];
108-
else
109-
overrides[commandline_current].dma = DMA_NONE;
110-
overrides[commandline_current].board = board;
111-
++commandline_current;
112-
}
113-
}
114-
115-
116-
/**
117-
* do_NCR53C80_setup - set up entry point
118-
* @str: unused
119-
*
120-
* Setup function invoked at boot to parse the ncr5380= command
121-
* line.
122-
*/
123-
124-
static int __init do_NCR5380_setup(char *str)
125-
{
126-
int ints[10];
127-
128-
get_options(str, ARRAY_SIZE(ints), ints);
129-
internal_setup(BOARD_NCR5380, str, ints);
130-
return 1;
131-
}
132-
133-
/**
134-
* do_NCR53C400_setup - set up entry point
135-
* @str: unused
136-
* @ints: integer parameters from kernel setup code
137-
*
138-
* Setup function invoked at boot to parse the ncr53c400= command
139-
* line.
140-
*/
141-
142-
static int __init do_NCR53C400_setup(char *str)
143-
{
144-
int ints[10];
145-
146-
get_options(str, ARRAY_SIZE(ints), ints);
147-
internal_setup(BOARD_NCR53C400, str, ints);
148-
return 1;
149-
}
150-
151-
/**
152-
* do_NCR53C400A_setup - set up entry point
153-
* @str: unused
154-
* @ints: integer parameters from kernel setup code
155-
*
156-
* Setup function invoked at boot to parse the ncr53c400a= command
157-
* line.
158-
*/
159-
160-
static int __init do_NCR53C400A_setup(char *str)
161-
{
162-
int ints[10];
163-
164-
get_options(str, ARRAY_SIZE(ints), ints);
165-
internal_setup(BOARD_NCR53C400A, str, ints);
166-
return 1;
167-
}
168-
169-
/**
170-
* do_DTC3181E_setup - set up entry point
171-
* @str: unused
172-
* @ints: integer parameters from kernel setup code
173-
*
174-
* Setup function invoked at boot to parse the dtc3181e= command
175-
* line.
176-
*/
177-
178-
static int __init do_DTC3181E_setup(char *str)
179-
{
180-
int ints[10];
181-
182-
get_options(str, ARRAY_SIZE(ints), ints);
183-
internal_setup(BOARD_DTC3181E, str, ints);
184-
return 1;
185-
}
186-
187-
#endif
188-
18959
#ifndef SCSI_G_NCR5380_MEM
19060
/*
19161
* Configure I/O address of 53C400A or DTC436 by writing magic numbers
@@ -741,8 +611,3 @@ static struct isapnp_device_id id_table[] = {
741611

742612
MODULE_DEVICE_TABLE(isapnp, id_table);
743613
#endif
744-
745-
__setup("ncr5380=", do_NCR5380_setup);
746-
__setup("ncr53c400=", do_NCR53C400_setup);
747-
__setup("ncr53c400a=", do_NCR53C400A_setup);
748-
__setup("dtc3181e=", do_DTC3181E_setup);

0 commit comments

Comments
 (0)