Prev: [PATCH 08/11] staging: crystalhd: clean up crystalhd_user_open() return code
Next: EIP: is at inet6_csk_bind_conflict + 06xe/0xb7 [ipv6]
From: Yoichi Yuasa on 25 Apr 2010 09:50
Signed-off-by: Yoichi Yuasa <yuasa(a)linux-mips.org>
---
drivers/staging/crystalhd/crystalhd_hw.c | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/staging/crystalhd/crystalhd_hw.c b/drivers/staging/crystalhd/crystalhd_hw.c
index 4e4d271..ba81d01 100644
--- a/drivers/staging/crystalhd/crystalhd_hw.c
+++ b/drivers/staging/crystalhd/crystalhd_hw.c
@@ -119,7 +119,7 @@ static bool crystalhd_bring_out_of_rst(struct crystalhd_adp *adp)
return true;
}

-static bool crystalhd_put_in_reset(struct crystalhd_adp *adp)
+static void crystalhd_put_in_reset(struct crystalhd_adp *adp)
{
link_misc_perst_deco_ctrl rst_deco_cntrl;
link_misc_perst_clk_ctrl rst_clk_cntrl;
@@ -171,8 +171,6 @@ static bool crystalhd_put_in_reset(struct crystalhd_adp *adp)

/* restore the transaction configuration register */
crystalhd_reg_wr(adp, PCIE_TL_TRANSACTION_CONFIGURATION, temp);
-
- return true;
}

static void crystalhd_disable_interrupts(struct crystalhd_adp *adp)
@@ -332,8 +330,7 @@ static bool crystalhd_stop_device(struct crystalhd_adp *adp)
crystalhd_clear_errors(adp);
crystalhd_clear_interrupts(adp);

- if (!crystalhd_put_in_reset(adp))
- BCMLOG_ERR("Failed to Put Link To Reset State\n");
+ crystalhd_put_in_reset(adp);

reg = crystalhd_reg_rd(adp, PCIE_DLL_DATA_LINK_CONTROL);
reg |= ASPM_L1_ENABLE;
--
1.7.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [PATCH 08/11] staging: crystalhd: clean up crystalhd_user_open() return code
Next: EIP: is at inet6_csk_bind_conflict + 06xe/0xb7 [ipv6]