Skip to content

Commit dfd1986

Browse files
Dr. David Alan Gilbertgregkh
authored andcommitted
parport: Remove parport_driver.devmodel
'devmodel' hasn't actually been used since: 'commit 3275158 ("parport: remove use of devmodel")' and everyone now has it set to true and has been fixed up; remove the flag. (There are still comments all over about it) Signed-off-by: Dr. David Alan Gilbert <[email protected]> Acked-by: Sudip Mukherjee <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent ed06e05 commit dfd1986

File tree

24 files changed

+0
-27
lines changed

24 files changed

+0
-27
lines changed

drivers/ata/pata_parport/pata_parport.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,6 @@ static struct parport_driver pata_parport_driver = {
768768
.name = DRV_NAME,
769769
.match_port = pata_parport_attach,
770770
.detach = pata_parport_detach,
771-
.devmodel = true,
772771
};
773772

774773
static __init int pata_parport_init(void)

drivers/auxdisplay/ks0108.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,6 @@ static struct parport_driver ks0108_parport_driver = {
162162
.name = "ks0108",
163163
.match_port = ks0108_parport_attach,
164164
.detach = ks0108_parport_detach,
165-
.devmodel = true,
166165
};
167166
module_parport_driver(ks0108_parport_driver);
168167

drivers/auxdisplay/panel.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1706,7 +1706,6 @@ static struct parport_driver panel_driver = {
17061706
.name = "panel",
17071707
.match_port = panel_attach,
17081708
.detach = panel_detach,
1709-
.devmodel = true,
17101709
};
17111710
module_parport_driver(panel_driver);
17121711

drivers/char/lp.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,6 @@ static struct parport_driver lp_driver = {
10161016
.name = "lp",
10171017
.match_port = lp_attach,
10181018
.detach = lp_detach,
1019-
.devmodel = true,
10201019
};
10211020

10221021
static int __init lp_init(void)

drivers/char/ppdev.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -839,7 +839,6 @@ static struct parport_driver pp_driver = {
839839
.probe = pp_probe,
840840
.match_port = pp_attach,
841841
.detach = pp_detach,
842-
.devmodel = true,
843842
};
844843

845844
static int __init ppdev_init(void)

drivers/i2c/busses/i2c-parport.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,6 @@ static struct parport_driver i2c_parport_driver = {
400400
.name = "i2c-parport",
401401
.match_port = i2c_parport_attach,
402402
.detach = i2c_parport_detach,
403-
.devmodel = true,
404403
};
405404
module_parport_driver(i2c_parport_driver);
406405

drivers/input/joystick/db9.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -673,7 +673,6 @@ static struct parport_driver db9_parport_driver = {
673673
.name = "db9",
674674
.match_port = db9_attach,
675675
.detach = db9_detach,
676-
.devmodel = true,
677676
};
678677

679678
static int __init db9_init(void)

drivers/input/joystick/gamecon.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1016,7 +1016,6 @@ static struct parport_driver gc_parport_driver = {
10161016
.name = "gamecon",
10171017
.match_port = gc_attach,
10181018
.detach = gc_detach,
1019-
.devmodel = true,
10201019
};
10211020

10221021
static int __init gc_init(void)

drivers/input/joystick/turbografx.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,6 @@ static struct parport_driver tgfx_parport_driver = {
274274
.name = "turbografx",
275275
.match_port = tgfx_attach,
276276
.detach = tgfx_detach,
277-
.devmodel = true,
278277
};
279278

280279
static int __init tgfx_init(void)

drivers/input/joystick/walkera0701.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,6 @@ static struct parport_driver walkera0701_parport_driver = {
293293
.name = "walkera0701",
294294
.match_port = walkera0701_attach,
295295
.detach = walkera0701_detach,
296-
.devmodel = true,
297296
};
298297

299298
module_parport_driver(walkera0701_parport_driver);

drivers/input/serio/parkbd.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,5 @@ static struct parport_driver parkbd_parport_driver = {
218218
.name = "parkbd",
219219
.match_port = parkbd_attach,
220220
.detach = parkbd_detach,
221-
.devmodel = true,
222221
};
223222
module_parport_driver(parkbd_parport_driver);

drivers/net/hamradio/baycom_epp.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1193,7 +1193,6 @@ static int baycom_epp_par_probe(struct pardevice *par_dev)
11931193
static struct parport_driver baycom_epp_par_driver = {
11941194
.name = "bce",
11951195
.probe = baycom_epp_par_probe,
1196-
.devmodel = true,
11971196
};
11981197

11991198
static void __init baycom_epp_dev_setup(struct net_device *dev)

drivers/net/hamradio/baycom_par.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,6 @@ static int baycom_par_probe(struct pardevice *par_dev)
503503
static struct parport_driver baycom_par_driver = {
504504
.name = "bcp",
505505
.probe = baycom_par_probe,
506-
.devmodel = true,
507506
};
508507

509508
static int __init init_baycompar(void)

drivers/net/plip/plip.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1358,7 +1358,6 @@ static struct parport_driver plip_driver = {
13581358
.probe = plip_probe,
13591359
.match_port = plip_attach,
13601360
.detach = plip_detach,
1361-
.devmodel = true,
13621361
};
13631362

13641363
static void __exit plip_cleanup_module (void)

drivers/parport/daisy.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ static int daisy_drv_probe(struct pardevice *par_dev)
9797
static struct parport_driver daisy_driver = {
9898
.name = "daisy_drv",
9999
.probe = daisy_drv_probe,
100-
.devmodel = true,
101100
};
102101

103102
/* Discover the IEEE1284.3 topology on a port -- muxes and daisy chains.

drivers/pps/clients/pps_parport.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@ static struct parport_driver pps_parport_driver = {
216216
.name = KBUILD_MODNAME,
217217
.match_port = parport_attach,
218218
.detach = parport_detach,
219-
.devmodel = true,
220219
};
221220
module_parport_driver(pps_parport_driver);
222221

drivers/pps/generators/pps_gen_parport.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,6 @@ static struct parport_driver pps_gen_parport_driver = {
232232
.name = KBUILD_MODNAME,
233233
.match_port = parport_attach,
234234
.detach = parport_detach,
235-
.devmodel = true,
236235
};
237236
module_parport_driver(pps_gen_parport_driver);
238237

drivers/scsi/imm.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1275,7 +1275,6 @@ static struct parport_driver imm_driver = {
12751275
.name = "imm",
12761276
.match_port = imm_attach,
12771277
.detach = imm_detach,
1278-
.devmodel = true,
12791278
};
12801279
module_parport_driver(imm_driver);
12811280

drivers/scsi/ppa.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1151,7 +1151,6 @@ static struct parport_driver ppa_driver = {
11511151
.name = "ppa",
11521152
.match_port = ppa_attach,
11531153
.detach = ppa_detach,
1154-
.devmodel = true,
11551154
};
11561155
module_parport_driver(ppa_driver);
11571156

drivers/spi/spi-butterfly.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -315,7 +315,6 @@ static struct parport_driver butterfly_driver = {
315315
.name = "spi_butterfly",
316316
.match_port = butterfly_attach,
317317
.detach = butterfly_detach,
318-
.devmodel = true,
319318
};
320319
module_parport_driver(butterfly_driver);
321320

drivers/spi/spi-lm70llp.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,6 @@ static struct parport_driver spi_lm70llp_drv = {
318318
.name = DRVNAME,
319319
.match_port = spi_lm70llp_attach,
320320
.detach = spi_lm70llp_detach,
321-
.devmodel = true,
322321
};
323322
module_parport_driver(spi_lm70llp_drv);
324323

include/linux/parport.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,6 @@ struct parport_driver {
256256
void (*match_port)(struct parport *);
257257
int (*probe)(struct pardevice *);
258258
struct device_driver driver;
259-
bool devmodel;
260259
};
261260

262261
#define to_parport_driver(n) container_of(n, struct parport_driver, driver)
@@ -299,9 +298,6 @@ int __must_check __parport_register_driver(struct parport_driver *,
299298
* to receive notifications about ports being found in the
300299
* system, as well as ports no longer available.
301300
*
302-
* If devmodel is true then the new device model is used
303-
* for registration.
304-
*
305301
* The @driver structure is allocated by the caller and must not be
306302
* deallocated until after calling parport_unregister_driver().
307303
*

sound/drivers/mts64.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -882,7 +882,6 @@ static struct parport_driver mts64_parport_driver = {
882882
.probe = snd_mts64_dev_probe,
883883
.match_port = snd_mts64_attach,
884884
.detach = snd_mts64_detach,
885-
.devmodel = true,
886885
};
887886

888887
/*********************************************************************

sound/drivers/portman2x4.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,6 @@ static struct parport_driver portman_parport_driver = {
668668
.probe = snd_portman_dev_probe,
669669
.match_port = snd_portman_attach,
670670
.detach = snd_portman_detach,
671-
.devmodel = true,
672671
};
673672

674673
/*********************************************************************

0 commit comments

Comments
 (0)