diff options
| author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2007-08-15 10:32:08 -0600 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2007-08-24 01:27:23 -0400 |
| commit | 1e0aa9ad721349781b728ec4226876247e3fd431 (patch) | |
| tree | 420685fa219339ba275f6c632d5c51d6d70310ac /drivers/pnp/card.c | |
| parent | b377fd3982ad957c796758a90e2988401a884241 (diff) | |
| download | op-kernel-dev-1e0aa9ad721349781b728ec4226876247e3fd431.zip op-kernel-dev-1e0aa9ad721349781b728ec4226876247e3fd431.tar.gz | |
PNP: fix up after Lindent
More manual fixups after Lindent. No functional change.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Acked-by: Adam Belay <abelay@novell.com>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'drivers/pnp/card.c')
| -rw-r--r-- | drivers/pnp/card.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c index b6a4f02..6c0440c 100644 --- a/drivers/pnp/card.c +++ b/drivers/pnp/card.c @@ -25,13 +25,13 @@ static const struct pnp_card_device_id *match_card(struct pnp_card_driver *drv, int found; struct pnp_dev *dev; - if (i == PNP_MAX_DEVICES - || !*drv_id->devs[i].id) + if (i == PNP_MAX_DEVICES || + !*drv_id->devs[i].id) return drv_id; found = 0; card_for_each_dev(card, dev) { - if (compare_pnp_id - (dev->id, drv_id->devs[i].id)) { + if (compare_pnp_id(dev->id, + drv_id->devs[i].id)) { found = 1; break; } @@ -183,7 +183,7 @@ static int pnp_interface_attach_card(struct pnp_card *card) return 0; - err_name: +err_name: device_remove_file(&card->dev, &dev_attr_name); return rc; } @@ -321,10 +321,10 @@ struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink, pos = pos->next; } - done: +done: return NULL; - found: +found: dev->card_link = clink; dev->dev.driver = &drv->link.driver; if (pnp_bus_type.probe(&dev->dev)) @@ -334,7 +334,7 @@ struct pnp_dev *pnp_request_card_device(struct pnp_card_link *clink, return dev; - err_out: +err_out: dev->dev.driver = NULL; dev->card_link = NULL; return NULL; |
