Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit af3ce514ade2fd0e18c5d078d138a6c1137a33df

Authored by Daniel Walker
Committed by Paul Mackerras
1 parent 56783c5e4d
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[POWERPC] macintosh: ADB driver: adb_handler_sem semaphore to mutex 

Signed-off-by: Daniel Walker <dwalker@mvista.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

Showing 1 changed file with 15 additions and 15 deletions Side-by-side Diff

drivers/macintosh/adb.c
Diff comments   View file @ af3ce51
... ... @@ -37,7 +37,7 @@
37 37 #include <linux/device.h>
38 38 #include <linux/kthread.h>
39 39 #include <linux/platform_device.h>
40   -#include <linux/semaphore.h>
  40 +#include <linux/mutex.h>
41 41  
42 42 #include <asm/uaccess.h>
43 43 #ifdef CONFIG_PPC
... ... @@ -102,7 +102,7 @@
102 102 } adb_handler[16];
103 103  
104 104 /*
105   - * The adb_handler_sem mutex protects all accesses to the original_address
  105 + * The adb_handler_mutex mutex protects all accesses to the original_address
106 106 * and handler_id fields of adb_handler[i] for all i, and changes to the
107 107 * handler field.
108 108 * Accesses to the handler field are protected by the adb_handler_lock
... ... @@ -110,7 +110,7 @@
110 110 * time adb_unregister returns, we know that the old handler isn't being
111 111 * called.
112 112 */
113   -static DECLARE_MUTEX(adb_handler_sem);
  113 +static DEFINE_MUTEX(adb_handler_mutex);
114 114 static DEFINE_RWLOCK(adb_handler_lock);
115 115  
116 116 #if 0
... ... @@ -355,7 +355,7 @@
355 355 msleep(500);
356 356 }
357 357  
358   - down(&adb_handler_sem);
  358 + mutex_lock(&adb_handler_mutex);
359 359 write_lock_irq(&adb_handler_lock);
360 360 memset(adb_handler, 0, sizeof(adb_handler));
361 361 write_unlock_irq(&adb_handler_lock);
... ... @@ -376,7 +376,7 @@
376 376 if (adb_controller->autopoll)
377 377 adb_controller->autopoll(autopoll_devs);
378 378 }
379   - up(&adb_handler_sem);
  379 + mutex_unlock(&adb_handler_mutex);
380 380  
381 381 blocking_notifier_call_chain(&adb_client_list,
382 382 ADB_MSG_POST_RESET, NULL);
... ... @@ -454,7 +454,7 @@
454 454 {
455 455 int i;
456 456  
457   - down(&adb_handler_sem);
  457 + mutex_lock(&adb_handler_mutex);
458 458 ids->nids = 0;
459 459 for (i = 1; i < 16; i++) {
460 460 if ((adb_handler[i].original_address == default_id) &&
... ... @@ -472,7 +472,7 @@
472 472 ids->id[ids->nids++] = i;
473 473 }
474 474 }
475   - up(&adb_handler_sem);
  475 + mutex_unlock(&adb_handler_mutex);
476 476 return ids->nids;
477 477 }
478 478  
... ... @@ -481,7 +481,7 @@
481 481 {
482 482 int ret = -ENODEV;
483 483  
484   - down(&adb_handler_sem);
  484 + mutex_lock(&adb_handler_mutex);
485 485 write_lock_irq(&adb_handler_lock);
486 486 if (adb_handler[index].handler) {
487 487 while(adb_handler[index].busy) {
... ... @@ -493,7 +493,7 @@
493 493 adb_handler[index].handler = NULL;
494 494 }
495 495 write_unlock_irq(&adb_handler_lock);
496   - up(&adb_handler_sem);
  496 + mutex_unlock(&adb_handler_mutex);
497 497 return ret;
498 498 }
499 499  
500 500  
501 501  
502 502  
... ... @@ -557,19 +557,19 @@
557 557 {
558 558 int ret;
559 559  
560   - down(&adb_handler_sem);
  560 + mutex_lock(&adb_handler_mutex);
561 561 ret = try_handler_change(address, new_id);
562   - up(&adb_handler_sem);
  562 + mutex_unlock(&adb_handler_mutex);
563 563 return ret;
564 564 }
565 565  
566 566 int
567 567 adb_get_infos(int address, int *original_address, int *handler_id)
568 568 {
569   - down(&adb_handler_sem);
  569 + mutex_lock(&adb_handler_mutex);
570 570 *original_address = adb_handler[address].original_address;
571 571 *handler_id = adb_handler[address].handler_id;
572   - up(&adb_handler_sem);
  572 + mutex_unlock(&adb_handler_mutex);
573 573  
574 574 return (*original_address != 0);
575 575 }
576 576  
... ... @@ -628,10 +628,10 @@
628 628 case ADB_QUERY_GETDEVINFO:
629 629 if (req->nbytes < 3)
630 630 break;
631   - down(&adb_handler_sem);
  631 + mutex_lock(&adb_handler_mutex);
632 632 req->reply[0] = adb_handler[req->data[2]].original_address;
633 633 req->reply[1] = adb_handler[req->data[2]].handler_id;
634   - up(&adb_handler_sem);
  634 + mutex_unlock(&adb_handler_mutex);
635 635 req->complete = 1;
636 636 req->reply_len = 2;
637 637 adb_write_done(req);