iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parport: Convert to use managed functions pcim_* and devm_*

Browse Source 
This makes the error handling much more simpler than open-coding everything
and in addition makes the probe function smaller an tidier.

Tested-by: Nikola Ciprich <nikola.ciprich@linuxbox.cz>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Andy Shevchenko 2018-02-07 19:47:53 +00:00 committed by Greg Kroah-Hartman
parent 1089c91111
commit ad8ce834bf
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/parport/parport_serial.c
View File

@ -620,27 +620,23 @@ static int parport_serial_pci_probe(struct pci_dev *dev,
struct parport_serial_private *priv; struct parport_serial_private *priv;
int err; int err;
priv = kzalloc (sizeof *priv, GFP_KERNEL); priv = devm_kzalloc(&dev->dev, sizeof(*priv), GFP_KERNEL);
if (!priv) if (!priv)
return -ENOMEM; return -ENOMEM;
pci_set_drvdata (dev, priv); pci_set_drvdata (dev, priv);
err = pci_enable_device (dev); err = pcim_enable_device(dev);
if (err) { if (err)
kfree (priv);
return err; return err;
}
if (parport_register (dev, id)) { if (parport_register(dev, id))
kfree (priv);
return -ENODEV; return -ENODEV;
}
if (serial_register (dev, id)) { if (serial_register (dev, id)) {
int i; int i;
for (i = 0; i < priv->num_par; i++) for (i = 0; i < priv->num_par; i++)
parport_pc_unregister_port (priv->port[i]); parport_pc_unregister_port (priv->port[i]);
kfree (priv);
return -ENODEV; return -ENODEV;
} }
@ -660,7 +656,6 @@ static void parport_serial_pci_remove(struct pci_dev *dev)
for (i = 0; i < priv->num_par; i++) for (i = 0; i < priv->num_par; i++)
parport_pc_unregister_port (priv->port[i]); parport_pc_unregister_port (priv->port[i]);
kfree (priv);
return; return;
} }