Commit 056a8763 authored by Russell King's avatar Russell King Committed by Russell King

[PATCH] Serial: No need to check for priv != NULL in remove_one

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent fbc0dc0d
...@@ -1766,33 +1766,30 @@ pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent) ...@@ -1766,33 +1766,30 @@ pciserial_init_one(struct pci_dev *dev, const struct pci_device_id *ent)
static void __devexit pciserial_remove_one(struct pci_dev *dev) static void __devexit pciserial_remove_one(struct pci_dev *dev)
{ {
struct serial_private *priv = pci_get_drvdata(dev); struct serial_private *priv = pci_get_drvdata(dev);
struct pci_serial_quirk *quirk;
int i;
pci_set_drvdata(dev, NULL); pci_set_drvdata(dev, NULL);
if (priv) { for (i = 0; i < priv->nr; i++)
struct pci_serial_quirk *quirk; serial8250_unregister_port(priv->line[i]);
int i;
for (i = 0; i < priv->nr; i++)
serial8250_unregister_port(priv->line[i]);
for (i = 0; i < PCI_NUM_BAR_RESOURCES; i++) { for (i = 0; i < PCI_NUM_BAR_RESOURCES; i++) {
if (priv->remapped_bar[i]) if (priv->remapped_bar[i])
iounmap(priv->remapped_bar[i]); iounmap(priv->remapped_bar[i]);
priv->remapped_bar[i] = NULL; priv->remapped_bar[i] = NULL;
} }
/* /*
* Find the exit quirks. * Find the exit quirks.
*/ */
quirk = find_quirk(dev); quirk = find_quirk(dev);
if (quirk->exit) if (quirk->exit)
quirk->exit(dev); quirk->exit(dev);
pci_disable_device(dev); pci_disable_device(dev);
kfree(priv); kfree(priv);
}
} }
static int pciserial_suspend_one(struct pci_dev *dev, pm_message_t state) static int pciserial_suspend_one(struct pci_dev *dev, pm_message_t state)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment