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

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>

diff --git a/drivers/parport/parport_serial.c b/drivers/parport/parport_serial.c
index d0a5bc542bac72b3e472b9b4ce25e13808f4f340..050eeb06913acf3a779d8d41a9974386c0108c29 100644 (file)
--- a/drivers/parport/parport_serial.c
+++ b/drivers/parport/parport_serial.c
@@ -620,27 +620,23 @@ static int parport_serial_pci_probe(struct pci_dev *dev,
        struct parport_serial_private *priv;
        int err;
 
-       priv = kzalloc (sizeof *priv, GFP_KERNEL);
+       priv = devm_kzalloc(&dev->dev, sizeof(*priv), GFP_KERNEL);
        if (!priv)
                return -ENOMEM;
+
        pci_set_drvdata (dev, priv);
 
-       err = pci_enable_device (dev);
-       if (err) {
-               kfree (priv);
+       err = pcim_enable_device(dev);
+       if (err)
                return err;
-       }
 
-       if (parport_register (dev, id)) {
-               kfree (priv);
+       if (parport_register(dev, id))
                return -ENODEV;
-       }
 
        if (serial_register (dev, id)) {
                int i;
                for (i = 0; i < priv->num_par; i++)
                        parport_pc_unregister_port (priv->port[i]);
-               kfree (priv);
                return -ENODEV;
        }
 
@@ -660,7 +656,6 @@ static void parport_serial_pci_remove(struct pci_dev *dev)
        for (i = 0; i < priv->num_par; i++)
                parport_pc_unregister_port (priv->port[i]);
 
-       kfree (priv);
        return;
 }