From: Krzysztof Kozlowski <krzk@kernel.org> To: Florian Fainelli <f.fainelli@gmail.com>, Ray Jui <rjui@broadcom.com>, Scott Branden <sbranden@broadcom.com>, bcm-kernel-feedback-list@broadcom.com, Russell King <linux@armlinux.org.uk>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, Krzysztof Kozlowski <krzk@kernel.org>, Markus Mayer <mmayer@broadcom.com>, Roger Quadros <rogerq@ti.com>, Tony Lindgren <tony@atomide.com>, Vladimir Zapolskiy <vz@mleia.com>, Kukjin Kim <kgene@kernel.org>, Lukasz Luba <lukasz.luba@arm.com>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-pm@vger.kernel.org Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de> Subject: [PATCH 07/16] memory: omap-gpmc: Correct white space issues Date: Fri, 24 Jul 2020 20:23:19 +0200 [thread overview] Message-ID: <20200724182328.3348-8-krzk@kernel.org> (raw) In-Reply-To: <20200724182328.3348-1-krzk@kernel.org> Remove some unneeded blank lines, align indentation with open parenthesis (or fix existing alignment). Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- drivers/memory/omap-gpmc.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index e4d2f359bcfa..9339a7c75fdd 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -297,7 +297,6 @@ static unsigned long gpmc_get_fclk_period(void) */ static unsigned long gpmc_get_clk_period(int cs, enum gpmc_clk_domain cd) { - unsigned long tick_ps = gpmc_get_fclk_period(); u32 l; int div; @@ -317,7 +316,6 @@ static unsigned long gpmc_get_clk_period(int cs, enum gpmc_clk_domain cd) } return tick_ps; - } static unsigned int gpmc_ns_to_clk_ticks(unsigned int time_ns, int cs, @@ -509,7 +507,7 @@ static void gpmc_cs_show_timings(int cs, const char *desc) GPMC_GET_RAW_BOOL(GPMC_CS_CONFIG1, 4, 4, "time-para-granularity"); GPMC_GET_RAW(GPMC_CS_CONFIG1, 8, 9, "mux-add-data"); GPMC_GET_RAW_SHIFT_MAX(GPMC_CS_CONFIG1, 12, 13, 1, - GPMC_CONFIG1_DEVICESIZE_MAX, "device-width"); + GPMC_CONFIG1_DEVICESIZE_MAX, "device-width"); GPMC_GET_RAW(GPMC_CS_CONFIG1, 16, 17, "wait-pin"); GPMC_GET_RAW_BOOL(GPMC_CS_CONFIG1, 21, 21, "wait-on-write"); GPMC_GET_RAW_BOOL(GPMC_CS_CONFIG1, 22, 22, "wait-on-read"); @@ -623,9 +621,8 @@ static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit, int max l = gpmc_cs_read_reg(cs, reg); #ifdef CONFIG_OMAP_GPMC_DEBUG - pr_info( - "GPMC CS%d: %-17s: %3d ticks, %3lu ns (was %3i ticks) %3d ns\n", - cs, name, ticks, gpmc_get_clk_period(cs, cd) * ticks / 1000, + pr_info("GPMC CS%d: %-17s: %3d ticks, %3lu ns (was %3i ticks) %3d ns\n", + cs, name, ticks, gpmc_get_clk_period(cs, cd) * ticks / 1000, (l >> st_bit) & mask, time); #endif l &= ~(mask << st_bit); @@ -652,7 +649,6 @@ static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit, int max */ static int gpmc_calc_waitmonitoring_divider(unsigned int wait_monitoring) { - int div = gpmc_ns_to_ticks(wait_monitoring); div += GPMC_CONFIG1_WAITMONITORINGTIME_MAX - 1; @@ -664,7 +660,6 @@ static int gpmc_calc_waitmonitoring_divider(unsigned int wait_monitoring) div = 1; return div; - } /** @@ -718,7 +713,6 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t, if (!s->sync_read && !s->sync_write && (s->wait_on_read || s->wait_on_write) ) { - div = gpmc_calc_waitmonitoring_divider(t->wait_monitoring); if (div < 0) { pr_err("%s: waitmonitoringtime %3d ns too large for greatest gpmcfclkdivider.\n", @@ -1512,7 +1506,6 @@ static void gpmc_mem_exit(void) continue; gpmc_cs_delete_mem(cs); } - } static void gpmc_mem_init(void) @@ -1681,17 +1674,14 @@ static int gpmc_calc_async_read_timings(struct gpmc_timings *gpmc_t, /* oe_on */ temp = dev_t->t_oeasu; if (mux) - temp = max_t(u32, temp, - gpmc_t->adv_rd_off + dev_t->t_aavdh); + temp = max_t(u32, temp, gpmc_t->adv_rd_off + dev_t->t_aavdh); gpmc_t->oe_on = gpmc_round_ps_to_ticks(temp); /* access */ temp = max_t(u32, dev_t->t_iaa, /* XXX: remove t_iaa in async ? */ - gpmc_t->oe_on + dev_t->t_oe); - temp = max_t(u32, temp, - gpmc_t->cs_on + dev_t->t_ce); - temp = max_t(u32, temp, - gpmc_t->adv_on + dev_t->t_aa); + gpmc_t->oe_on + dev_t->t_oe); + temp = max_t(u32, temp, gpmc_t->cs_on + dev_t->t_ce); + temp = max_t(u32, temp, gpmc_t->adv_on + dev_t->t_aa); gpmc_t->access = gpmc_round_ps_to_ticks(temp); gpmc_t->oe_off = gpmc_t->access + gpmc_ticks_to_ps(1); -- 2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Krzysztof Kozlowski <krzk@kernel.org> To: Florian Fainelli <f.fainelli@gmail.com>, Ray Jui <rjui@broadcom.com>, Scott Branden <sbranden@broadcom.com>, bcm-kernel-feedback-list@broadcom.com, Russell King <linux@armlinux.org.uk>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, Krzysztof Kozlowski <krzk@kernel.org>, Markus Mayer <mmayer@broadcom.com>, Roger Quadros <rogerq@ti.com>, Tony Lindgren <tony@atomide.com>, Vladimir Zapolskiy <vz@mleia.com>, Kukjin Kim <kgene@kernel.org>, Lukasz Luba <lukasz.luba@arm.com>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-pm@vger.kernel.org Cc: Olof Johansson <olof@lixom.net>, Arnd Bergmann <arnd@arndb.de> Subject: [PATCH 07/16] memory: omap-gpmc: Correct white space issues Date: Fri, 24 Jul 2020 20:23:19 +0200 [thread overview] Message-ID: <20200724182328.3348-8-krzk@kernel.org> (raw) In-Reply-To: <20200724182328.3348-1-krzk@kernel.org> Remove some unneeded blank lines, align indentation with open parenthesis (or fix existing alignment). Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> --- drivers/memory/omap-gpmc.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/drivers/memory/omap-gpmc.c b/drivers/memory/omap-gpmc.c index e4d2f359bcfa..9339a7c75fdd 100644 --- a/drivers/memory/omap-gpmc.c +++ b/drivers/memory/omap-gpmc.c @@ -297,7 +297,6 @@ static unsigned long gpmc_get_fclk_period(void) */ static unsigned long gpmc_get_clk_period(int cs, enum gpmc_clk_domain cd) { - unsigned long tick_ps = gpmc_get_fclk_period(); u32 l; int div; @@ -317,7 +316,6 @@ static unsigned long gpmc_get_clk_period(int cs, enum gpmc_clk_domain cd) } return tick_ps; - } static unsigned int gpmc_ns_to_clk_ticks(unsigned int time_ns, int cs, @@ -509,7 +507,7 @@ static void gpmc_cs_show_timings(int cs, const char *desc) GPMC_GET_RAW_BOOL(GPMC_CS_CONFIG1, 4, 4, "time-para-granularity"); GPMC_GET_RAW(GPMC_CS_CONFIG1, 8, 9, "mux-add-data"); GPMC_GET_RAW_SHIFT_MAX(GPMC_CS_CONFIG1, 12, 13, 1, - GPMC_CONFIG1_DEVICESIZE_MAX, "device-width"); + GPMC_CONFIG1_DEVICESIZE_MAX, "device-width"); GPMC_GET_RAW(GPMC_CS_CONFIG1, 16, 17, "wait-pin"); GPMC_GET_RAW_BOOL(GPMC_CS_CONFIG1, 21, 21, "wait-on-write"); GPMC_GET_RAW_BOOL(GPMC_CS_CONFIG1, 22, 22, "wait-on-read"); @@ -623,9 +621,8 @@ static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit, int max l = gpmc_cs_read_reg(cs, reg); #ifdef CONFIG_OMAP_GPMC_DEBUG - pr_info( - "GPMC CS%d: %-17s: %3d ticks, %3lu ns (was %3i ticks) %3d ns\n", - cs, name, ticks, gpmc_get_clk_period(cs, cd) * ticks / 1000, + pr_info("GPMC CS%d: %-17s: %3d ticks, %3lu ns (was %3i ticks) %3d ns\n", + cs, name, ticks, gpmc_get_clk_period(cs, cd) * ticks / 1000, (l >> st_bit) & mask, time); #endif l &= ~(mask << st_bit); @@ -652,7 +649,6 @@ static int set_gpmc_timing_reg(int cs, int reg, int st_bit, int end_bit, int max */ static int gpmc_calc_waitmonitoring_divider(unsigned int wait_monitoring) { - int div = gpmc_ns_to_ticks(wait_monitoring); div += GPMC_CONFIG1_WAITMONITORINGTIME_MAX - 1; @@ -664,7 +660,6 @@ static int gpmc_calc_waitmonitoring_divider(unsigned int wait_monitoring) div = 1; return div; - } /** @@ -718,7 +713,6 @@ int gpmc_cs_set_timings(int cs, const struct gpmc_timings *t, if (!s->sync_read && !s->sync_write && (s->wait_on_read || s->wait_on_write) ) { - div = gpmc_calc_waitmonitoring_divider(t->wait_monitoring); if (div < 0) { pr_err("%s: waitmonitoringtime %3d ns too large for greatest gpmcfclkdivider.\n", @@ -1512,7 +1506,6 @@ static void gpmc_mem_exit(void) continue; gpmc_cs_delete_mem(cs); } - } static void gpmc_mem_init(void) @@ -1681,17 +1674,14 @@ static int gpmc_calc_async_read_timings(struct gpmc_timings *gpmc_t, /* oe_on */ temp = dev_t->t_oeasu; if (mux) - temp = max_t(u32, temp, - gpmc_t->adv_rd_off + dev_t->t_aavdh); + temp = max_t(u32, temp, gpmc_t->adv_rd_off + dev_t->t_aavdh); gpmc_t->oe_on = gpmc_round_ps_to_ticks(temp); /* access */ temp = max_t(u32, dev_t->t_iaa, /* XXX: remove t_iaa in async ? */ - gpmc_t->oe_on + dev_t->t_oe); - temp = max_t(u32, temp, - gpmc_t->cs_on + dev_t->t_ce); - temp = max_t(u32, temp, - gpmc_t->adv_on + dev_t->t_aa); + gpmc_t->oe_on + dev_t->t_oe); + temp = max_t(u32, temp, gpmc_t->cs_on + dev_t->t_ce); + temp = max_t(u32, temp, gpmc_t->adv_on + dev_t->t_aa); gpmc_t->access = gpmc_round_ps_to_ticks(temp); gpmc_t->oe_off = gpmc_t->access + gpmc_ticks_to_ps(1); -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-07-24 18:24 UTC|newest] Thread overview: 70+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-07-24 18:23 [PATCH 00/16] memory: Further cleanups Krzysztof Kozlowski 2020-07-24 18:23 ` Krzysztof Kozlowski 2020-07-24 18:23 ` [PATCH 01/16] memory: bt1-l2-ctl: Add blank lines after declarations Krzysztof Kozlowski 2020-07-24 18:23 ` Krzysztof Kozlowski 2020-07-27 8:16 ` Krzysztof Kozlowski 2020-07-27 8:16 ` Krzysztof Kozlowski 2020-07-24 18:23 ` [PATCH 02/16] memory: mvebu-devbus: Add missing braces to all arms of if statement Krzysztof Kozlowski 2020-07-24 18:23 ` Krzysztof Kozlowski 2020-07-27 8:16 ` Krzysztof Kozlowski 2020-07-27 8:16 ` Krzysztof Kozlowski 2020-07-24 18:23 ` [PATCH 03/16] memory: mvebu-devbus: Align with open parenthesis Krzysztof Kozlowski 2020-07-24 18:23 ` Krzysztof Kozlowski 2020-07-27 8:16 ` Krzysztof Kozlowski 2020-07-27 8:16 ` Krzysztof Kozlowski 2020-07-24 18:23 ` [PATCH 04/16] memory: omap-gpmc: Correct kerneldoc Krzysztof Kozlowski 2020-07-24 18:23 ` Krzysztof Kozlowski 2020-07-27 8:16 ` Krzysztof Kozlowski 2020-07-27 8:16 ` Krzysztof Kozlowski 2020-07-24 18:23 ` [PATCH 05/16] memory: omap-gpmc: Enclose macro argument usage in parenthesis Krzysztof Kozlowski 2020-07-24 18:23 ` Krzysztof Kozlowski 2020-07-27 8:16 ` Krzysztof Kozlowski 2020-07-27 8:16 ` Krzysztof Kozlowski 2020-07-24 18:23 ` [PATCH 06/16] memory: omap-gpmc: Use 'unsigned int' for consistency Krzysztof Kozlowski 2020-07-24 18:23 ` Krzysztof Kozlowski 2020-07-27 8:15 ` Krzysztof Kozlowski 2020-07-27 8:15 ` Krzysztof Kozlowski 2020-07-24 18:23 ` Krzysztof Kozlowski [this message] 2020-07-24 18:23 ` [PATCH 07/16] memory: omap-gpmc: Correct white space issues Krzysztof Kozlowski 2020-07-27 8:15 ` Krzysztof Kozlowski 2020-07-27 8:15 ` Krzysztof Kozlowski 2020-07-24 18:23 ` [RFT 08/16] memory: omap-gpmc: Use WARN() instead of BUG() on wrong free Krzysztof Kozlowski 2020-07-24 18:23 ` Krzysztof Kozlowski 2020-08-17 18:36 ` Krzysztof Kozlowski 2020-08-17 18:36 ` Krzysztof Kozlowski 2020-07-24 18:23 ` [PATCH 09/16] memory: omap-gpmc: Fix language typo Krzysztof Kozlowski 2020-07-24 18:23 ` Krzysztof Kozlowski 2020-07-27 8:15 ` Krzysztof Kozlowski 2020-07-27 8:15 ` Krzysztof Kozlowski 2020-07-24 18:23 ` [PATCH 10/16] memory: omap-gpmc: Consistently use !res for NULL checks Krzysztof Kozlowski 2020-07-24 18:23 ` Krzysztof Kozlowski 2020-08-17 18:37 ` Krzysztof Kozlowski 2020-08-17 18:37 ` Krzysztof Kozlowski 2020-07-24 18:23 ` [PATCH 11/16] memory: brcmstb_dpfe: Fix language typo Krzysztof Kozlowski 2020-07-24 18:23 ` Krzysztof Kozlowski 2020-07-24 18:38 ` Florian Fainelli 2020-07-24 18:38 ` Florian Fainelli 2020-07-27 8:14 ` Krzysztof Kozlowski 2020-07-27 8:14 ` Krzysztof Kozlowski 2020-07-24 18:23 ` [RFT 12/16] memory: brcmstb_dpfe: Add separate entry for compile test Krzysztof Kozlowski 2020-07-24 18:23 ` Krzysztof Kozlowski 2020-07-24 18:40 ` Florian Fainelli 2020-07-24 18:40 ` Florian Fainelli 2020-07-24 18:42 ` Krzysztof Kozlowski 2020-07-24 18:42 ` Krzysztof Kozlowski 2020-08-17 18:38 ` Krzysztof Kozlowski 2020-08-17 18:38 ` Krzysztof Kozlowski 2020-07-24 18:23 ` [PATCH 13/16] memory: of: Correct kerneldoc Krzysztof Kozlowski 2020-07-24 18:23 ` Krzysztof Kozlowski 2020-07-27 8:09 ` Krzysztof Kozlowski 2020-07-27 8:09 ` Krzysztof Kozlowski 2020-07-24 18:23 ` [PATCH 14/16] memory: pl172: Enclose macro argument usage in parenthesis Krzysztof Kozlowski 2020-07-24 18:23 ` Krzysztof Kozlowski 2020-07-27 8:09 ` Krzysztof Kozlowski 2020-07-27 8:09 ` Krzysztof Kozlowski 2020-07-24 18:23 ` [PATCH 15/16] memory: samsung: exynos-srom: Correct alignment Krzysztof Kozlowski 2020-07-24 18:23 ` Krzysztof Kozlowski 2020-07-24 18:23 ` [PATCH 16/16] memory: samsung: exynos5422-dmc: Correct white space issues Krzysztof Kozlowski 2020-07-24 18:23 ` Krzysztof Kozlowski 2020-08-18 8:22 ` Lukasz Luba 2020-08-18 8:22 ` Lukasz Luba
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200724182328.3348-8-krzk@kernel.org \ --to=krzk@kernel.org \ --cc=arnd@arndb.de \ --cc=bcm-kernel-feedback-list@broadcom.com \ --cc=catalin.marinas@arm.com \ --cc=f.fainelli@gmail.com \ --cc=kgene@kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-omap@vger.kernel.org \ --cc=linux-pm@vger.kernel.org \ --cc=linux-samsung-soc@vger.kernel.org \ --cc=linux@armlinux.org.uk \ --cc=lukasz.luba@arm.com \ --cc=mmayer@broadcom.com \ --cc=olof@lixom.net \ --cc=rjui@broadcom.com \ --cc=rogerq@ti.com \ --cc=sbranden@broadcom.com \ --cc=tony@atomide.com \ --cc=vz@mleia.com \ --cc=will@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.