From patchwork Mon Dec 7 11:50:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 57780 Delivered-To: patch@linaro.org Received: by 10.202.179.86 with SMTP id c83csp945361oif; Mon, 7 Dec 2015 03:54:21 -0800 (PST) X-Received: by 10.67.22.137 with SMTP id hs9mr42727475pad.66.1449489261212; Mon, 07 Dec 2015 03:54:21 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id z18si21088779pfa.80.2015.12.07.03.54.20; Mon, 07 Dec 2015 03:54:21 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dkim=neutral (body hash did not verify) header.i=@linaro-org.20150623.gappssmtp.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932268AbbLGLyS (ORCPT + 28 others); Mon, 7 Dec 2015 06:54:18 -0500 Received: from mail-wm0-f49.google.com ([74.125.82.49]:35787 "EHLO mail-wm0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932128AbbLGLuw (ORCPT ); Mon, 7 Dec 2015 06:50:52 -0500 Received: by wmuu63 with SMTP id u63so136983437wmu.0 for ; Mon, 07 Dec 2015 03:50:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro-org.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=8Op9Ur72p4ToR64uopmAvQg+hMB9to5e4Fp8nEvRQFI=; b=kgBRnhToef+mmcOH/rz+lL8+uBkdcyNHqG4TpnjGRjx7LkvpMBjGW+pHLvEt5Zbjb8 rTFfQ2M6Kp8km3ixZ6oYIBzijwV4cQAwVavaCqNJ1IDV8sM7Ph5oSMP9vfhLJPXo9WmH sc1kFa7KGgtieHC0kKfnMAihznkwatqhoE7dUdBBc+6gMDoZKLZgKJ0ynCeDsWfl0fkC T+G0frWW38AS4ji7kBRBDK5rAWSzJc+koIM/SBOrqQeIo+73Zw9YyLH/mIomurjy6yDr Py5PD4zZP75EwFiQrtCSKzLIktPojFNQ8G4GDaV+U2PDkkNJJZ0uit619369UAF30Xz5 Njvg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=8Op9Ur72p4ToR64uopmAvQg+hMB9to5e4Fp8nEvRQFI=; b=Xhg5eZrOe6ucf1hO/zMlyMR7n7nBZF9+snXNn6fPqjPJtYpmBqi7H0+qWeyAlrNR9G c/WnkEikyNu89rqlmn+aMpyFkYlkxVK+xw3/tcwHM1nk98R0RM8IEmf84GvPe25L9YD/ VLnD0Npt80WfJLV9PlKAQPH7SH/D9CX7IaagsYCDfRexzyH6gA+0WNdAhmnZNwqPAY8M p2x/PgrWftqzmos9uB4o8t4NL2Iyt31giJHaLgeSk4LEoMdYVWsaFFp+3yg5xSB0Idvn Z9rfKxyT0TxQD681DRYQf8mU9v5vn76x1k9o/StPDFi9YbUcBYWKCeIKmnqtRmYIHrnS Bsqw== X-Gm-Message-State: ALoCoQkohDG8xnp9aRM5/eSE/gLdMPpcjfSsel0txWAa9NR5lscywzOI1EbpCgM2fOolAdWwhuWq X-Received: by 10.194.179.33 with SMTP id dd1mr37880440wjc.133.1449489051097; Mon, 07 Dec 2015 03:50:51 -0800 (PST) Received: from localhost.localdomain (host81-129-174-134.range81-129.btcentralplus.com. [81.129.174.134]) by smtp.gmail.com with ESMTPSA id z1sm24806533wje.35.2015.12.07.03.50.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 07 Dec 2015 03:50:50 -0800 (PST) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 12/19] mfd: asic3: Fix a plethora of Checkpatch errors and warnings Date: Mon, 7 Dec 2015 11:50:25 +0000 Message-Id: <1449489032-14374-13-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1449489032-14374-1-git-send-email-lee.jones@linaro.org> References: <1449489032-14374-1-git-send-email-lee.jones@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ERROR: Macros with complex values should be enclosed in parentheses +#define INIT_CDEX(_name, _rate) \ + [ASIC3_CLOCK_##_name] = { \ + .cdex = CLOCK_CDEX_##_name, \ + .rate = _rate, \ + } WARNING: line over 80 characters + ASIC3_GPIO_INT_STATUS); WARNING: void function return statements are not generally useful + return; +} WARNING: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt + msleep(1); WARNING: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt + msleep(1); WARNING: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt + msleep(1); WARNING: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt + msleep(1); WARNING: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt + msleep(1); WARNING: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt + msleep(1); WARNING: msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt + msleep(1); WARNING: line over 80 characters + asic->tmio_cnf = ioremap((ASIC3_SD_CONFIG_BASE >> asic->bus_shift) + WARNING: Prefer [subsystem eg: netdev]_err([subsystem]dev, ... then dev_err(dev, ... then p r_err(... to printk(KERN_ERR ... + printk(KERN_ERR "kzalloc failed\n"); WARNING: Possible unnecessary 'out of memory' message + if (asic == NULL) { + printk(KERN_ERR "kzalloc failed\n"); WARNING: Missing a blank line after declarations + int retval = 0; + retval = platform_driver_probe(&asic3_device_driver, asic3_probe); total: 1 errors, 13 warnings, 1081 lines checked Signed-off-by: Lee Jones --- drivers/mfd/asic3.c | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) -- 1.9.1 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ diff --git a/drivers/mfd/asic3.c b/drivers/mfd/asic3.c index a726f01..d09f805 100644 --- a/drivers/mfd/asic3.c +++ b/drivers/mfd/asic3.c @@ -167,7 +167,6 @@ static void asic3_irq_demux(struct irq_desc *desc) base = ASIC3_GPIO_A_BASE + bank * ASIC3_GPIO_BASE_INCR; - spin_lock_irqsave(&asic->lock, flags); istat = asic3_read_register(asic, base + @@ -536,8 +535,6 @@ static void asic3_gpio_set(struct gpio_chip *chip, asic3_write_register(asic, gpio_base + ASIC3_GPIO_OUT, out_reg); spin_unlock_irqrestore(&asic->lock, flags); - - return; } static int asic3_gpio_to_irq(struct gpio_chip *chip, unsigned offset) @@ -665,18 +662,18 @@ static int ds1wm_enable(struct platform_device *pdev) asic3_clk_enable(asic, &asic->clocks[ASIC3_CLOCK_EX0]); asic3_clk_enable(asic, &asic->clocks[ASIC3_CLOCK_EX1]); asic3_clk_enable(asic, &asic->clocks[ASIC3_CLOCK_OWM]); - msleep(1); + usleep_range(1000, 5000); /* Reset and enable DS1WM */ asic3_set_register(asic, ASIC3_OFFSET(EXTCF, RESET), ASIC3_EXTCF_OWM_RESET, 1); - msleep(1); + usleep_range(1000, 5000); asic3_set_register(asic, ASIC3_OFFSET(EXTCF, RESET), ASIC3_EXTCF_OWM_RESET, 0); - msleep(1); + usleep_range(1000, 5000); asic3_set_register(asic, ASIC3_OFFSET(EXTCF, SELECT), ASIC3_EXTCF_OWM_EN, 1); - msleep(1); + usleep_range(1000, 5000); return 0; } @@ -757,7 +754,7 @@ static int asic3_mmc_enable(struct platform_device *pdev) * when HCLK is stopped. */ asic3_clk_enable(asic, &asic->clocks[ASIC3_CLOCK_EX1]); - msleep(1); + usleep_range(1000, 5000); /* HCLK 24.576 MHz, BCLK 12.288 MHz: */ asic3_write_register(asic, ASIC3_OFFSET(CLOCK, SEL), @@ -765,7 +762,7 @@ static int asic3_mmc_enable(struct platform_device *pdev) asic3_clk_enable(asic, &asic->clocks[ASIC3_CLOCK_SD_HOST]); asic3_clk_enable(asic, &asic->clocks[ASIC3_CLOCK_SD_BUS]); - msleep(1); + usleep_range(1000, 5000); asic3_set_register(asic, ASIC3_OFFSET(EXTCF, SELECT), ASIC3_EXTCF_SD_MEM_ENABLE, 1); @@ -841,7 +838,7 @@ static int asic3_leds_suspend(struct platform_device *pdev) struct asic3 *asic = dev_get_drvdata(pdev->dev.parent); while (asic3_gpio_get(&asic->gpio, ASIC3_GPIO(C, cell->id)) != 0) - msleep(1); + usleep_range(1000, 5000); asic3_clk_disable(asic, &asic->clocks[clock_ledn[cell->id]]); @@ -900,8 +897,8 @@ static int __init asic3_mfd_probe(struct platform_device *pdev, /* MMC */ if (mem_sdio) { - asic->tmio_cnf = ioremap((ASIC3_SD_CONFIG_BASE >> asic->bus_shift) + - mem_sdio->start, + asic->tmio_cnf = ioremap((ASIC3_SD_CONFIG_BASE >> + asic->bus_shift) + mem_sdio->start, ASIC3_SD_CONFIG_SIZE >> asic->bus_shift); if (!asic->tmio_cnf) { ret = -ENOMEM; @@ -962,10 +959,8 @@ static int __init asic3_probe(struct platform_device *pdev) asic = devm_kzalloc(&pdev->dev, sizeof(struct asic3), GFP_KERNEL); - if (asic == NULL) { - printk(KERN_ERR "kzalloc failed\n"); + if (!asic) return -ENOMEM; - } spin_lock_init(&asic->lock); platform_set_drvdata(pdev, asic); @@ -1074,7 +1069,9 @@ static struct platform_driver asic3_device_driver = { static int __init asic3_init(void) { int retval = 0; + retval = platform_driver_probe(&asic3_device_driver, asic3_probe); + return retval; }