parport_pc: Add a mode mask field for PCI devices
authorMaciej W. Rozycki <macro@orcam.me.uk>
Sun, 8 Jan 2023 21:56:53 +0000 (21:56 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 20 Jan 2023 12:12:00 +0000 (13:12 +0100)
Add a mode mask field for PCI devices and use `__parport_pc_probe_port'
in place of `parport_pc_probe_port' to apply it.

Signed-off-by: Maciej W. Rozycki <macro@orcam.me.uk>
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Link: https://lore.kernel.org/r/20230108215656.6433-4-sudipm.mukherjee@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/parport/parport_pc.c

index ad49fd3..2928f36 100644 (file)
@@ -2659,6 +2659,9 @@ static struct parport_pc_pci {
                /* -1 if not there, >6 for offset-method (max BAR is 6) */
        } addr[4];
 
+       /* Bit field of parport modes to exclude. */
+       unsigned int mode_mask;
+
        /* If set, this is called immediately after pci_enable_device.
         * If it returns non-zero, no probing will take place and the
         * ports will not be used. */
@@ -2862,9 +2865,10 @@ static int parport_pc_pci_probe(struct pci_dev *dev,
                               id->vendor, id->device, io_lo, io_hi, irq);
                }
                data->ports[count] =
-                       parport_pc_probe_port(io_lo, io_hi, irq,
-                                              PARPORT_DMA_NONE, &dev->dev,
-                                              IRQF_SHARED);
+                       __parport_pc_probe_port(io_lo, io_hi, irq,
+                                               PARPORT_DMA_NONE, &dev->dev,
+                                               IRQF_SHARED,
+                                               cards[i].mode_mask, 0);
                if (data->ports[count])
                        count++;
        }