mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-26 20:38:12 +00:00
serial: 8250_pci: add .probe member to struct pci_serial_quirk
This function, if present, is called early on by the 8250_pci probe; it can be used to reject devices meant for parport_serial. (The .init function cannot be used for this purpose, as it is also called by parport_serial.) Signed-off-by: Frédéric Brière <fbriere@fbriere.net> Acked-by: Alan Cox <alan@linux.intel.com> Cc: linux-serial@vger.kernel.org Cc: linux-parport@lists.infradead.org Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
7808edcd30
commit
5bf8f501e0
1 changed files with 9 additions and 0 deletions
|
@ -39,6 +39,7 @@ struct pci_serial_quirk {
|
||||||
u32 device;
|
u32 device;
|
||||||
u32 subvendor;
|
u32 subvendor;
|
||||||
u32 subdevice;
|
u32 subdevice;
|
||||||
|
int (*probe)(struct pci_dev *dev);
|
||||||
int (*init)(struct pci_dev *dev);
|
int (*init)(struct pci_dev *dev);
|
||||||
int (*setup)(struct serial_private *,
|
int (*setup)(struct serial_private *,
|
||||||
const struct pciserial_board *,
|
const struct pciserial_board *,
|
||||||
|
@ -2662,11 +2663,19 @@ EXPORT_SYMBOL_GPL(pciserial_resume_ports);
|
||||||
static int __devinit
|
static int __devinit
|
||||||
pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
|
pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
|
||||||
{
|
{
|
||||||
|
struct pci_serial_quirk *quirk;
|
||||||
struct serial_private *priv;
|
struct serial_private *priv;
|
||||||
const struct pciserial_board *board;
|
const struct pciserial_board *board;
|
||||||
struct pciserial_board tmp;
|
struct pciserial_board tmp;
|
||||||
int rc;
|
int rc;
|
||||||
|
|
||||||
|
quirk = find_quirk(dev);
|
||||||
|
if (quirk->probe) {
|
||||||
|
rc = quirk->probe(dev);
|
||||||
|
if (rc)
|
||||||
|
return rc;
|
||||||
|
}
|
||||||
|
|
||||||
if (ent->driver_data >= ARRAY_SIZE(pci_boards)) {
|
if (ent->driver_data >= ARRAY_SIZE(pci_boards)) {
|
||||||
printk(KERN_ERR "pci_init_one: invalid driver_data: %ld\n",
|
printk(KERN_ERR "pci_init_one: invalid driver_data: %ld\n",
|
||||||
ent->driver_data);
|
ent->driver_data);
|
||||||
|
|
Loading…
Reference in a new issue