diff options
author | Ben Gardner <bgardner@wabtec.com> | 2006-01-18 16:46:26 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-03-23 17:21:49 -0500 |
commit | 8a05940d742174a87427a3fe746712d49d4b8c4b (patch) | |
tree | 0dd0fc84a3b2818c75e0b692ba16fd17b57d60c4 | |
parent | 9b7b6d3b2b46c5c336a441ed12b504ee192e63b3 (diff) |
[PATCH] i2c: scx200_acb remove use of lock_kernel
scx200_acb: remove use of lock_kernel()
Signed-off-by: Ben Gardner <bgardner@wabtec.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r-- | drivers/i2c/busses/scx200_acb.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c index 517a050625f1..02150bb25d43 100644 --- a/drivers/i2c/busses/scx200_acb.c +++ b/drivers/i2c/busses/scx200_acb.c | |||
@@ -378,6 +378,7 @@ static struct i2c_algorithm scx200_acb_algorithm = { | |||
378 | }; | 378 | }; |
379 | 379 | ||
380 | static struct scx200_acb_iface *scx200_acb_list; | 380 | static struct scx200_acb_iface *scx200_acb_list; |
381 | static DECLARE_MUTEX(scx200_acb_list_mutex); | ||
381 | 382 | ||
382 | static int scx200_acb_probe(struct scx200_acb_iface *iface) | 383 | static int scx200_acb_probe(struct scx200_acb_iface *iface) |
383 | { | 384 | { |
@@ -463,10 +464,10 @@ static int __init scx200_acb_create(int base, int index) | |||
463 | goto errout_release; | 464 | goto errout_release; |
464 | } | 465 | } |
465 | 466 | ||
466 | lock_kernel(); | 467 | down(&scx200_acb_list_mutex); |
467 | iface->next = scx200_acb_list; | 468 | iface->next = scx200_acb_list; |
468 | scx200_acb_list = iface; | 469 | scx200_acb_list = iface; |
469 | unlock_kernel(); | 470 | up(&scx200_acb_list_mutex); |
470 | 471 | ||
471 | return 0; | 472 | return 0; |
472 | 473 | ||
@@ -509,17 +510,17 @@ static void __exit scx200_acb_cleanup(void) | |||
509 | { | 510 | { |
510 | struct scx200_acb_iface *iface; | 511 | struct scx200_acb_iface *iface; |
511 | 512 | ||
512 | lock_kernel(); | 513 | down(&scx200_acb_list_mutex); |
513 | while ((iface = scx200_acb_list) != NULL) { | 514 | while ((iface = scx200_acb_list) != NULL) { |
514 | scx200_acb_list = iface->next; | 515 | scx200_acb_list = iface->next; |
515 | unlock_kernel(); | 516 | up(&scx200_acb_list_mutex); |
516 | 517 | ||
517 | i2c_del_adapter(&iface->adapter); | 518 | i2c_del_adapter(&iface->adapter); |
518 | release_region(iface->base, 8); | 519 | release_region(iface->base, 8); |
519 | kfree(iface); | 520 | kfree(iface); |
520 | lock_kernel(); | 521 | down(&scx200_acb_list_mutex); |
521 | } | 522 | } |
522 | unlock_kernel(); | 523 | up(&scx200_acb_list_mutex); |
523 | } | 524 | } |
524 | 525 | ||
525 | module_init(scx200_acb_init); | 526 | module_init(scx200_acb_init); |