evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Russell King 2005-07-22 10:15:04 +01:00 • committed by Russell King
parent fbc0dc0df5
commit 056a8763fc
1 changed files with 19 additions and 22 deletions

41
drivers/serial/8250_pci.c
View file

@ -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++) for (i = 0; i < PCI_NUM_BAR_RESOURCES; i++) {
serial8250_unregister_port(priv->line[i]); if (priv->remapped_bar[i])
iounmap(priv->remapped_bar[i]);
for (i = 0; i < PCI_NUM_BAR_RESOURCES; i++) { priv->remapped_bar[i] = NULL;
if (priv->remapped_bar[i])
iounmap(priv->remapped_bar[i]);
priv->remapped_bar[i] = NULL;
}
/*
* Find the exit quirks.
*/
quirk = find_quirk(dev);
if (quirk->exit)
quirk->exit(dev);
pci_disable_device(dev);
kfree(priv);
} }
/*
* Find the exit quirks.
*/
quirk = find_quirk(dev);
if (quirk->exit)
quirk->exit(dev);
pci_disable_device(dev);
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)