aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/misc/ti-st/st_core.c
diff options
context:
space:
mode:
authorPavan Savoy <pavan_savoy@ti.com>2011-02-04 03:23:15 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-04 15:41:21 -0500
commit781a7395d239dbdb59738ca7fe08e71641bf583c (patch)
treefb57da5401614e1b727457b78c7582327be61265 /drivers/misc/ti-st/st_core.c
parent6d71ba2105a1d8c1712cdfcf46fc6040e4707cb9 (diff)
drivers:misc: ti-st: remove multiple gpio handling
TI shared transport driver previously intended to expose rfkill entries for each of the protocol gpio that the chip would have. However now in case such gpios exist, which requires to be enabled for a specific protocol, the responsibility lay on protocol driver. This patch removes the request/free of multiple gpios, rfkill struct references and also removes the chip_toggle function. Signed-off-by: Pavan Savoy <pavan_savoy@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/misc/ti-st/st_core.c')
-rw-r--r--drivers/misc/ti-st/st_core.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/misc/ti-st/st_core.c b/drivers/misc/ti-st/st_core.c
index f0d24d852078..1847c477c0c0 100644
--- a/drivers/misc/ti-st/st_core.c
+++ b/drivers/misc/ti-st/st_core.c
@@ -515,7 +515,6 @@ long st_register(struct st_proto_s *new_proto)
515 if (test_bit(ST_REG_IN_PROGRESS, &st_gdata->st_state)) { 515 if (test_bit(ST_REG_IN_PROGRESS, &st_gdata->st_state)) {
516 pr_info(" ST_REG_IN_PROGRESS:%d ", new_proto->chnl_id); 516 pr_info(" ST_REG_IN_PROGRESS:%d ", new_proto->chnl_id);
517 /* fw download in progress */ 517 /* fw download in progress */
518 st_kim_chip_toggle(new_proto->chnl_id, KIM_GPIO_ACTIVE);
519 518
520 add_channel_to_table(st_gdata, new_proto); 519 add_channel_to_table(st_gdata, new_proto);
521 st_gdata->protos_registered++; 520 st_gdata->protos_registered++;
@@ -548,10 +547,6 @@ long st_register(struct st_proto_s *new_proto)
548 return -EINVAL; 547 return -EINVAL;
549 } 548 }
550 549
551 /* the chnl_id might require other gpios to be toggled
552 */
553 st_kim_chip_toggle(new_proto->chnl_id, KIM_GPIO_ACTIVE);
554
555 clear_bit(ST_REG_IN_PROGRESS, &st_gdata->st_state); 550 clear_bit(ST_REG_IN_PROGRESS, &st_gdata->st_state);
556 st_recv = st_int_recv; 551 st_recv = st_int_recv;
557 552
@@ -622,12 +617,6 @@ long st_unregister(struct st_proto_s *proto)
622 617
623 st_gdata->protos_registered--; 618 st_gdata->protos_registered--;
624 remove_channel_from_table(st_gdata, proto); 619 remove_channel_from_table(st_gdata, proto);
625
626 /* kim ignores BT in the below function
627 * and handles the rest, BT is toggled
628 * only in kim_start and kim_stop
629 */
630 st_kim_chip_toggle(proto->chnl_id, KIM_GPIO_INACTIVE);
631 spin_unlock_irqrestore(&st_gdata->lock, flags); 620 spin_unlock_irqrestore(&st_gdata->lock, flags);
632 621
633 if ((st_gdata->protos_registered == ST_EMPTY) && 622 if ((st_gdata->protos_registered == ST_EMPTY) &&