From e5060d8dfc21c69766652d2ab9b7fa7f4bbd546c Mon Sep 17 00:00:00 2001 From: Oleksij Rempel Date: Thu, 10 May 2012 09:59:24 +0200 Subject: [PATCH] --- yaml --- r: 304619 b: refs/heads/master c: 2ff4ff54a1d7f54ec587fe2eca737d5cbf32686b h: refs/heads/master i: 304617: 5264e03ad4e2d77aa00a0fbfc2fe60818b3459be 304615: 9416f725a6b319c7e5cecff4ec8de9139b9bd373 v: v3 --- [refs] | 2 +- trunk/drivers/staging/rts5139/sd_cprm.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 06478ee007c2..304d94e3aed9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 231a1a25eb9ccf3ac57f1908500a8d08ba28a62c +refs/heads/master: 2ff4ff54a1d7f54ec587fe2eca737d5cbf32686b diff --git a/trunk/drivers/staging/rts5139/sd_cprm.c b/trunk/drivers/staging/rts5139/sd_cprm.c index ba4d189e6f2e..55e3286b4997 100644 --- a/trunk/drivers/staging/rts5139/sd_cprm.c +++ b/trunk/drivers/staging/rts5139/sd_cprm.c @@ -77,11 +77,6 @@ static inline int get_rsp_type(u8 rsp_code, u8 *rsp_type, int *rsp_len) return STATUS_SUCCESS; } -int soft_reset_sd_card(struct rts51x_chip *chip) -{ - return reset_sd(chip); -} - int ext_sd_send_cmd_get_rsp(struct rts51x_chip *chip, u8 cmd_idx, u32 arg, u8 rsp_type, u8 *rsp, int rsp_len, int special_check) @@ -1041,7 +1036,7 @@ int sd_hw_rst(struct scsi_cmnd *srb, struct rts51x_chip *chip) case 1: /* reset CMD(CMD0) and Initialization * (without SD Card Power Off -> ON) */ - retval = soft_reset_sd_card(chip); + retval = reset_sd(chip); if (retval != STATUS_SUCCESS) { set_sense_type(chip, lun, SENSE_TYPE_MEDIA_NOT_PRESENT); sd_card->pre_cmd_err = 1;