parport: Remove parport_driver.devmodel

'devmodel' hasn't actually been used since:
  'commit 3275158fa52a ("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 <linux@treblig.org>
Acked-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Link: https://lore.kernel.org/r/20240502154823.67235-4-linux@treblig.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/ata/pata_parport/pata_parport.c b/drivers/ata/pata_parport/pata_parport.c
index 9a2cb9ca9d1dabfb6a3948abf90ad36d42d79b3d..93ebf566b54ec753ed95eac132c86c7e15533566 100644 (file)
--- a/drivers/ata/pata_parport/pata_parport.c
+++ b/drivers/ata/pata_parport/pata_parport.c
@@ -768,7 +768,6 @@ static struct parport_driver pata_parport_driver = {
        .name = DRV_NAME,
        .match_port = pata_parport_attach,
        .detach = pata_parport_detach,
-       .devmodel = true,
 };
 
 static __init int pata_parport_init(void)

diff --git a/drivers/auxdisplay/ks0108.c b/drivers/auxdisplay/ks0108.c
index 234f9dbe6e300542dc4cc1b3f1d62bb01fbf9cbd..51587f0fdaaec3a9685656055c6ae1599c72e515 100644 (file)
--- a/drivers/auxdisplay/ks0108.c
+++ b/drivers/auxdisplay/ks0108.c
@@ -162,7 +162,6 @@ static struct parport_driver ks0108_parport_driver = {
        .name = "ks0108",
        .match_port = ks0108_parport_attach,
        .detach = ks0108_parport_detach,
-       .devmodel = true,
 };
 module_parport_driver(ks0108_parport_driver);
 

diff --git a/drivers/auxdisplay/panel.c b/drivers/auxdisplay/panel.c
index 049ff443e790d61a60ae6bb9dd670d24b7b4f6c1..a731f28455b45f632fd4b5376cca826ca3a4fedc 100644 (file)
--- a/drivers/auxdisplay/panel.c
+++ b/drivers/auxdisplay/panel.c
@@ -1706,7 +1706,6 @@ static struct parport_driver panel_driver = {
        .name = "panel",
        .match_port = panel_attach,
        .detach = panel_detach,
-       .devmodel = true,
 };
 module_parport_driver(panel_driver);
 

diff --git a/drivers/char/lp.c b/drivers/char/lp.c
index 5faebe0365c5ea2bc1e6b36a89ad796321ed4563..24417a00dfe9ebba278f53a2adf85cf1a7fe6567 100644 (file)
--- a/drivers/char/lp.c
+++ b/drivers/char/lp.c
@@ -1016,7 +1016,6 @@ static struct parport_driver lp_driver = {
        .name = "lp",
        .match_port = lp_attach,
        .detach = lp_detach,
-       .devmodel = true,
 };
 
 static int __init lp_init(void)

diff --git a/drivers/char/ppdev.c b/drivers/char/ppdev.c
index 3655aa859185568be1cf59e3dfd8cd1ee9b2dc2b..eaff98dbaa8c84def65ba8afdf0d932adf28e443 100644 (file)
--- a/drivers/char/ppdev.c
+++ b/drivers/char/ppdev.c
@@ -839,7 +839,6 @@ static struct parport_driver pp_driver = {
        .probe          = pp_probe,
        .match_port     = pp_attach,
        .detach         = pp_detach,
-       .devmodel       = true,
 };
 
 static int __init ppdev_init(void)

diff --git a/drivers/i2c/busses/i2c-parport.c b/drivers/i2c/busses/i2c-parport.c
index 0af86a542568367ce04234b1f7e8db6b16ab11b5..3249bbd5eb43cc03a65ee00db1d98fcb141629d5 100644 (file)
--- a/drivers/i2c/busses/i2c-parport.c
+++ b/drivers/i2c/busses/i2c-parport.c
@@ -400,7 +400,6 @@ static struct parport_driver i2c_parport_driver = {
        .name = "i2c-parport",
        .match_port = i2c_parport_attach,
        .detach = i2c_parport_detach,
-       .devmodel = true,
 };
 module_parport_driver(i2c_parport_driver);
 

diff --git a/drivers/input/joystick/db9.c b/drivers/input/joystick/db9.c
index 4fba28b1a1e75b24537be9aab2c3b5c1567123fb..3ef66e458544914a09373b4d88beaf9d3ea897e9 100644 (file)
--- a/drivers/input/joystick/db9.c
+++ b/drivers/input/joystick/db9.c
@@ -673,7 +673,6 @@ static struct parport_driver db9_parport_driver = {
        .name = "db9",
        .match_port = db9_attach,
        .detach = db9_detach,
-       .devmodel = true,
 };
 
 static int __init db9_init(void)

diff --git a/drivers/input/joystick/gamecon.c b/drivers/input/joystick/gamecon.c
index 41d5dac05448137f0280ad32241b596665149382..7ed4892749fa32e6ef6de9ec86edb57e33cf17e1 100644 (file)
--- a/drivers/input/joystick/gamecon.c
+++ b/drivers/input/joystick/gamecon.c
@@ -1016,7 +1016,6 @@ static struct parport_driver gc_parport_driver = {
        .name = "gamecon",
        .match_port = gc_attach,
        .detach = gc_detach,
-       .devmodel = true,
 };
 
 static int __init gc_init(void)

diff --git a/drivers/input/joystick/turbografx.c b/drivers/input/joystick/turbografx.c
index dfb9c684651f355b34bfd1d11447c96869b55b08..baa14acaa3a8fc9861345276cf8c8bdbe02cd3d1 100644 (file)
--- a/drivers/input/joystick/turbografx.c
+++ b/drivers/input/joystick/turbografx.c
@@ -274,7 +274,6 @@ static struct parport_driver tgfx_parport_driver = {
        .name = "turbografx",
        .match_port = tgfx_attach,
        .detach = tgfx_detach,
-       .devmodel = true,
 };
 
 static int __init tgfx_init(void)

diff --git a/drivers/input/joystick/walkera0701.c b/drivers/input/joystick/walkera0701.c
index 27d95d6cf56e342e6d76695a3fa6ed3245e43262..59eea813f258fa4d542f8f62b92e70b769f175e0 100644 (file)
--- a/drivers/input/joystick/walkera0701.c
+++ b/drivers/input/joystick/walkera0701.c
@@ -293,7 +293,6 @@ static struct parport_driver walkera0701_parport_driver = {
        .name = "walkera0701",
        .match_port = walkera0701_attach,
        .detach = walkera0701_detach,
-       .devmodel = true,
 };
 
 module_parport_driver(walkera0701_parport_driver);

diff --git a/drivers/input/serio/parkbd.c b/drivers/input/serio/parkbd.c
index 0d54895428f5d554cf3983065f68469b959bb4ed..ac1f9ea3f969bc53ea991b63c76aa7d8cdbc9e10 100644 (file)
--- a/drivers/input/serio/parkbd.c
+++ b/drivers/input/serio/parkbd.c
@@ -218,6 +218,5 @@ static struct parport_driver parkbd_parport_driver = {
        .name = "parkbd",
        .match_port = parkbd_attach,
        .detach = parkbd_detach,
-       .devmodel = true,
 };
 module_parport_driver(parkbd_parport_driver);

diff --git a/drivers/net/hamradio/baycom_epp.c b/drivers/net/hamradio/baycom_epp.c
index ccfc83857c2604ec021fb105a102f1caf65b7309..9e366f275406ddad1ecb7dac25c1a140cefa808e 100644 (file)
--- a/drivers/net/hamradio/baycom_epp.c
+++ b/drivers/net/hamradio/baycom_epp.c
@@ -1193,7 +1193,6 @@ static int baycom_epp_par_probe(struct pardevice *par_dev)
 static struct parport_driver baycom_epp_par_driver = {
        .name = "bce",
        .probe = baycom_epp_par_probe,
-       .devmodel = true,
 };
 
 static void __init baycom_epp_dev_setup(struct net_device *dev)

diff --git a/drivers/net/hamradio/baycom_par.c b/drivers/net/hamradio/baycom_par.c
index fd7da5bb1fa5a8b7a1df35a82da37810f9cbfe12..00ebc25d0b22a706ab9582ca69fdfb49c4cdc65d 100644 (file)
--- a/drivers/net/hamradio/baycom_par.c
+++ b/drivers/net/hamradio/baycom_par.c
@@ -503,7 +503,6 @@ static int baycom_par_probe(struct pardevice *par_dev)
 static struct parport_driver baycom_par_driver = {
        .name = "bcp",
        .probe = baycom_par_probe,
-       .devmodel = true,
 };
 
 static int __init init_baycompar(void)

diff --git a/drivers/net/plip/plip.c b/drivers/net/plip/plip.c
index cc7d1113ece0ee7d6cfa0e1830bbbdc664c28514..e39bfaefe8c50ba72238d04f08deaa46ca650c70 100644 (file)
--- a/drivers/net/plip/plip.c
+++ b/drivers/net/plip/plip.c
@@ -1358,7 +1358,6 @@ static struct parport_driver plip_driver = {
        .probe          = plip_probe,
        .match_port     = plip_attach,
        .detach         = plip_detach,
-       .devmodel       = true,
 };
 
 static void __exit plip_cleanup_module (void)

diff --git a/drivers/parport/daisy.c b/drivers/parport/daisy.c
index 6d78ec3a762fcb36e27e21e75d0488a664d009e3..2231dbfd870d0066949eb373435709318ccf32f5 100644 (file)
--- a/drivers/parport/daisy.c
+++ b/drivers/parport/daisy.c
@@ -97,7 +97,6 @@ static int daisy_drv_probe(struct pardevice *par_dev)
 static struct parport_driver daisy_driver = {
        .name = "daisy_drv",
        .probe = daisy_drv_probe,
-       .devmodel = true,
 };
 
 /* Discover the IEEE1284.3 topology on a port -- muxes and daisy chains.

diff --git a/drivers/pps/clients/pps_parport.c b/drivers/pps/clients/pps_parport.c
index af972cdc04b53c8e7fec0b1456b97489c744006f..63d03a0df5cce9540c1da0a3162952c79c48999e 100644 (file)
--- a/drivers/pps/clients/pps_parport.c
+++ b/drivers/pps/clients/pps_parport.c
@@ -216,7 +216,6 @@ static struct parport_driver pps_parport_driver = {
        .name = KBUILD_MODNAME,
        .match_port = parport_attach,
        .detach = parport_detach,
-       .devmodel = true,
 };
 module_parport_driver(pps_parport_driver);
 

diff --git a/drivers/pps/generators/pps_gen_parport.c b/drivers/pps/generators/pps_gen_parport.c
index b3e084b75c237603dd61a0b65215403c2045d2cc..d46eed15949510b41632aa6ab6c6e6f0abf4b023 100644 (file)
--- a/drivers/pps/generators/pps_gen_parport.c
+++ b/drivers/pps/generators/pps_gen_parport.c
@@ -232,7 +232,6 @@ static struct parport_driver pps_gen_parport_driver = {
        .name = KBUILD_MODNAME,
        .match_port = parport_attach,
        .detach = parport_detach,
-       .devmodel = true,
 };
 module_parport_driver(pps_gen_parport_driver);
 

diff --git a/drivers/scsi/imm.c b/drivers/scsi/imm.c
index 21339da505f1ead5696bf093673366938b6d05e5..60e4f101c2bf2c8622a18f289d60086b00e02f1a 100644 (file)
--- a/drivers/scsi/imm.c
+++ b/drivers/scsi/imm.c
@@ -1275,7 +1275,6 @@ static struct parport_driver imm_driver = {
        .name           = "imm",
        .match_port     = imm_attach,
        .detach         = imm_detach,
-       .devmodel       = true,
 };
 module_parport_driver(imm_driver);
 

diff --git a/drivers/scsi/ppa.c b/drivers/scsi/ppa.c
index 8300f0bdddb37a4a1759f7779f7c9060ed7e66d0..3741972bc768aa3e123b9ecbea7031d992ddcfad 100644 (file)
--- a/drivers/scsi/ppa.c
+++ b/drivers/scsi/ppa.c
@@ -1151,7 +1151,6 @@ static struct parport_driver ppa_driver = {
        .name           = "ppa",
        .match_port     = ppa_attach,
        .detach         = ppa_detach,
-       .devmodel       = true,
 };
 module_parport_driver(ppa_driver);
 

diff --git a/drivers/spi/spi-butterfly.c b/drivers/spi/spi-butterfly.c
index 1d267e6c22a4f379d1f70b5e145f19417200bd29..84eb454ed443cacfedc328ef97fdd15c05074e6d 100644 (file)
--- a/drivers/spi/spi-butterfly.c
+++ b/drivers/spi/spi-butterfly.c
@@ -315,7 +315,6 @@ static struct parport_driver butterfly_driver = {
        .name =         "spi_butterfly",
        .match_port =   butterfly_attach,
        .detach =       butterfly_detach,
-       .devmodel = true,
 };
 module_parport_driver(butterfly_driver);
 

diff --git a/drivers/spi/spi-lm70llp.c b/drivers/spi/spi-lm70llp.c
index 3c0c24ed1f3dbe3de539fcd0297098b41a6efcf7..e61e89b4119f4195a636055d89612774a987dbcb 100644 (file)
--- a/drivers/spi/spi-lm70llp.c
+++ b/drivers/spi/spi-lm70llp.c
@@ -318,7 +318,6 @@ static struct parport_driver spi_lm70llp_drv = {
        .name =         DRVNAME,
        .match_port =   spi_lm70llp_attach,
        .detach =       spi_lm70llp_detach,
-       .devmodel =     true,
 };
 module_parport_driver(spi_lm70llp_drv);
 

diff --git a/include/linux/parport.h b/include/linux/parport.h
index 190de3569e25c8df738f9a236514bd08bb5645a8..464c2ad280396c2a4e29cc68013568af6f1fae3f 100644 (file)
--- a/include/linux/parport.h
+++ b/include/linux/parport.h
@@ -256,7 +256,6 @@ struct parport_driver {
        void (*match_port)(struct parport *);
        int (*probe)(struct pardevice *);
        struct device_driver driver;
-       bool devmodel;
 };
 
 #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 *,
  *     to receive notifications about ports being found in the
  *     system, as well as ports no longer available.
  *
- *     If devmodel is true then the new device model is used
- *     for registration.
- *
  *     The @driver structure is allocated by the caller and must not be
  *     deallocated until after calling parport_unregister_driver().
  *

diff --git a/sound/drivers/mts64.c b/sound/drivers/mts64.c
index 5cfd0e99a13f5b093bf60ab6b09a02f8ed8c4d24..b1b333d1cf396fb12b07339d37f3af678414630b 100644 (file)
--- a/sound/drivers/mts64.c
+++ b/sound/drivers/mts64.c
@@ -882,7 +882,6 @@ static struct parport_driver mts64_parport_driver = {
        .probe          = snd_mts64_dev_probe,
        .match_port     = snd_mts64_attach,
        .detach         = snd_mts64_detach,
-       .devmodel       = true,
 };
 
 /*********************************************************************

diff --git a/sound/drivers/portman2x4.c b/sound/drivers/portman2x4.c
index 619e3f5944772cee06e1a8e7825ddd98bbda0c66..6fd9e887002154643e0e75bd1b4546b1438ecac3 100644 (file)
--- a/sound/drivers/portman2x4.c
+++ b/sound/drivers/portman2x4.c
@@ -668,7 +668,6 @@ static struct parport_driver portman_parport_driver = {
        .probe          = snd_portman_dev_probe,
        .match_port     = snd_portman_attach,
        .detach         = snd_portman_detach,
-       .devmodel       = true,
 };
 
 /*********************************************************************