diff options
author | Bjorn Helgaas <bjorn.helgaas@hp.com> | 2007-07-26 13:41:21 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-26 14:35:21 -0400 |
commit | 07d4e9af109221ab731c5aaf832e89776c64b013 (patch) | |
tree | 05d05620af7b1b009f48dbad5f38004b682db271 /drivers/pnp/driver.c | |
parent | 9dd78466c956ac4b4f38e12032dc4249ccf57ad1 (diff) |
PNP: fix up after Lindent
These are manual fixups after running Lindent. No functional change.
Signed-off-by: Bjorn Helgaas <bjorn.helgaas@hp.com>
Cc: Len Brown <lenb@kernel.org>
Cc: Adam Belay <ambx1@neo.rr.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/pnp/driver.c')
-rw-r--r-- | drivers/pnp/driver.c | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/drivers/pnp/driver.c b/drivers/pnp/driver.c index 913d926f8baf..30b8f6f3258a 100644 --- a/drivers/pnp/driver.c +++ b/drivers/pnp/driver.c | |||
@@ -2,7 +2,6 @@ | |||
2 | * driver.c - device id matching, driver model, etc. | 2 | * driver.c - device id matching, driver model, etc. |
3 | * | 3 | * |
4 | * Copyright 2002 Adam Belay <ambx1@neo.rr.com> | 4 | * Copyright 2002 Adam Belay <ambx1@neo.rr.com> |
5 | * | ||
6 | */ | 5 | */ |
7 | 6 | ||
8 | #include <linux/string.h> | 7 | #include <linux/string.h> |
@@ -16,6 +15,7 @@ | |||
16 | static int compare_func(const char *ida, const char *idb) | 15 | static int compare_func(const char *ida, const char *idb) |
17 | { | 16 | { |
18 | int i; | 17 | int i; |
18 | |||
19 | /* we only need to compare the last 4 chars */ | 19 | /* we only need to compare the last 4 chars */ |
20 | for (i = 3; i < 7; i++) { | 20 | for (i = 3; i < 7; i++) { |
21 | if (ida[i] != 'X' && | 21 | if (ida[i] != 'X' && |
@@ -44,6 +44,7 @@ static const struct pnp_device_id *match_device(struct pnp_driver *drv, | |||
44 | struct pnp_dev *dev) | 44 | struct pnp_dev *dev) |
45 | { | 45 | { |
46 | const struct pnp_device_id *drv_id = drv->id_table; | 46 | const struct pnp_device_id *drv_id = drv->id_table; |
47 | |||
47 | if (!drv_id) | 48 | if (!drv_id) |
48 | return NULL; | 49 | return NULL; |
49 | 50 | ||
@@ -140,6 +141,7 @@ static int pnp_bus_match(struct device *dev, struct device_driver *drv) | |||
140 | { | 141 | { |
141 | struct pnp_dev *pnp_dev = to_pnp_dev(dev); | 142 | struct pnp_dev *pnp_dev = to_pnp_dev(dev); |
142 | struct pnp_driver *pnp_drv = to_pnp_driver(drv); | 143 | struct pnp_driver *pnp_drv = to_pnp_driver(drv); |
144 | |||
143 | if (match_device(pnp_drv, pnp_dev) == NULL) | 145 | if (match_device(pnp_drv, pnp_dev) == NULL) |
144 | return 0; | 146 | return 0; |
145 | return 1; | 147 | return 1; |
@@ -197,12 +199,12 @@ static int pnp_bus_resume(struct device *dev) | |||
197 | } | 199 | } |
198 | 200 | ||
199 | struct bus_type pnp_bus_type = { | 201 | struct bus_type pnp_bus_type = { |
200 | .name = "pnp", | 202 | .name = "pnp", |
201 | .match = pnp_bus_match, | 203 | .match = pnp_bus_match, |
202 | .probe = pnp_device_probe, | 204 | .probe = pnp_device_probe, |
203 | .remove = pnp_device_remove, | 205 | .remove = pnp_device_remove, |
204 | .suspend = pnp_bus_suspend, | 206 | .suspend = pnp_bus_suspend, |
205 | .resume = pnp_bus_resume, | 207 | .resume = pnp_bus_resume, |
206 | }; | 208 | }; |
207 | 209 | ||
208 | int pnp_register_driver(struct pnp_driver *drv) | 210 | int pnp_register_driver(struct pnp_driver *drv) |
@@ -225,12 +227,11 @@ void pnp_unregister_driver(struct pnp_driver *drv) | |||
225 | * pnp_add_id - adds an EISA id to the specified device | 227 | * pnp_add_id - adds an EISA id to the specified device |
226 | * @id: pointer to a pnp_id structure | 228 | * @id: pointer to a pnp_id structure |
227 | * @dev: pointer to the desired device | 229 | * @dev: pointer to the desired device |
228 | * | ||
229 | */ | 230 | */ |
230 | |||
231 | int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev) | 231 | int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev) |
232 | { | 232 | { |
233 | struct pnp_id *ptr; | 233 | struct pnp_id *ptr; |
234 | |||
234 | if (!id) | 235 | if (!id) |
235 | return -EINVAL; | 236 | return -EINVAL; |
236 | if (!dev) | 237 | if (!dev) |
@@ -248,8 +249,5 @@ int pnp_add_id(struct pnp_id *id, struct pnp_dev *dev) | |||
248 | 249 | ||
249 | EXPORT_SYMBOL(pnp_register_driver); | 250 | EXPORT_SYMBOL(pnp_register_driver); |
250 | EXPORT_SYMBOL(pnp_unregister_driver); | 251 | EXPORT_SYMBOL(pnp_unregister_driver); |
251 | #if 0 | ||
252 | EXPORT_SYMBOL(pnp_add_id); | ||
253 | #endif | ||
254 | EXPORT_SYMBOL(pnp_device_attach); | 252 | EXPORT_SYMBOL(pnp_device_attach); |
255 | EXPORT_SYMBOL(pnp_device_detach); | 253 | EXPORT_SYMBOL(pnp_device_detach); |