From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753910AbdA0CFp (ORCPT ); Thu, 26 Jan 2017 21:05:45 -0500 Received: from lucky1.263xmail.com ([211.157.147.133]:51569 "EHLO lucky1.263xmail.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752796AbdA0CFm (ORCPT ); Thu, 26 Jan 2017 21:05:42 -0500 X-263anti-spam: KSV:0;BIG:0; X-MAIL-GRAY: 1 X-MAIL-DELIVERY: 0 X-KSVirus-check: 0 X-ADDR-CHECKED4: 1 X-ABS-CHECKED: 1 X-SKE-CHECKED: 1 X-RL-SENDER: shawn.lin@rock-chips.com X-FST-TO: linux-kernel@vger.kernel.org X-SENDER-IP: 220.200.59.95 X-LOGIN-NAME: shawn.lin@rock-chips.com X-UNIQUE-TAG: <63e3c09b49c6a17b274cef77fc5047dc> X-ATTACHMENT-NUM: 0 X-DNS-TYPE: 0 Subject: Re: [PATCH 04/13] mmc: bcm2835: add bcm2835_check_data_error To: Gerd Hoffmann , linux-rpi-kernel@lists.infradead.org References: <1485473846-24537-1-git-send-email-kraxel@redhat.com> <1485473846-24537-5-git-send-email-kraxel@redhat.com> Cc: Stefan Wahren , Eric Anholt , Ulf Hansson , linux-mmc@vger.kernel.org, Florian Fainelli , Ray Jui , Scott Branden , "maintainer:BROADCOM BCM281XX/BCM11XXX/BCM216XX ARM ARCHITE..." , Stephen Warren , Lee Jones , "moderated list:BROADCOM BCM2835 ARM ARCHITECTURE" , open list From: Shawn Lin Message-ID: <3876dea7-cd61-e7cf-e838-8bab6927c8fb@rock-chips.com> Date: Fri, 27 Jan 2017 10:05:25 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.6.0 MIME-Version: 1.0 In-Reply-To: <1485473846-24537-5-git-send-email-kraxel@redhat.com> Content-Type: text/plain; charset=gbk; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2017/1/27 7:37, Gerd Hoffmann wrote: > Factor out common code. > > Signed-off-by: Gerd Hoffmann > --- > drivers/mmc/host/bcm2835.c | 30 ++++++++++++------------------ > 1 file changed, 12 insertions(+), 18 deletions(-) > > diff --git a/drivers/mmc/host/bcm2835.c b/drivers/mmc/host/bcm2835.c > index 6f9fb12..d25b85a 100644 > --- a/drivers/mmc/host/bcm2835.c > +++ b/drivers/mmc/host/bcm2835.c > @@ -951,6 +951,16 @@ static void bcm2835_timeout(unsigned long data) > spin_unlock_irqrestore(&host->lock, flags); > } > > +static void bcm2835_check_data_error(struct bcm2835_host *host, u32 intmask) > +{ > + if (!host->data) > + return; > + if (intmask & (SDHSTS_CRC16_ERROR | SDHSTS_FIFO_ERROR)) > + host->data->error = -EILSEQ; > + if (intmask & SDHSTS_REW_TIME_OUT) > + host->data->error = -ETIMEDOUT; > +} > + > static void bcm2835_busy_irq(struct bcm2835_host *host, u32 intmask) > { > struct device *dev = &host->pdev->dev; > @@ -1007,15 +1017,7 @@ static void bcm2835_data_irq(struct bcm2835_host *host, u32 intmask) > if (!host->data) > return; > remove this check, !host->data, as well. > - if (intmask & (SDHSTS_CRC16_ERROR | > - SDHSTS_FIFO_ERROR | > - SDHSTS_REW_TIME_OUT)) { > - if (intmask & (SDHSTS_CRC16_ERROR | > - SDHSTS_FIFO_ERROR)) > - host->data->error = -EILSEQ; > - else > - host->data->error = -ETIMEDOUT; > - } > + bcm2835_check_data_error(host, intmask); > > if (host->data->error) { > bcm2835_finish_data(host); > @@ -1043,15 +1045,7 @@ static void bcm2835_block_irq(struct bcm2835_host *host, u32 intmask) > return; > } > > - if (intmask & (SDHSTS_CRC16_ERROR | > - SDHSTS_FIFO_ERROR | > - SDHSTS_REW_TIME_OUT)) { > - if (intmask & (SDHSTS_CRC16_ERROR | > - SDHSTS_FIFO_ERROR)) > - host->data->error = -EILSEQ; > - else > - host->data->error = -ETIMEDOUT; > - } > + bcm2835_check_data_error(host, intmask); > > if (!host->dma_desc) { > WARN_ON(!host->blocks); > -- Best Regards Shawn Lin