clk: h8300: Drop allocation printk and cleanup sizeof style
PATCH 1/2 clk: h8300: Drop allocation printk and cleanup sizeof style
We don't need to print an error on allocation failures, drop it. While we're here, change the sizeof() to be sizeof(*<ptr>) to make code more future proof.
Cc Yoshinori Sato <[email protected]>
Signed-off-by Stephen Boyd <[email protected]>
--- drivers/clk/h8300/clk-h8s2678.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/clk/h8300/clk-h8s2678.c +2 -4
@@ -98,11 +98,9 @@ static void __init h8s2678_pll_clk_setup(struct device_node *node) } - pll_clock =kzalloc (sizeof (struct pll_clock ),GFP_KERNEL ); -if (!pll_clock) { -pr_err ("%s: failed to alloc memory" , clk_name); + pll_clock =kzalloc (sizeof (*pll_clock),GFP_KERNEL ); +if (!pll_clock)return ; - } pll_clock->sckcr =of_iomap (node,0 );if (pll_clock->sckcr ==NULL ) {
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH 2/2 clk: h8300: Use standard Linux I/O accessors
There doesn't seem to be any reason why we can't use the standard readb()/writeb() accessors here because ctrl_inb() and ctrl_outb() match the generic implementation of readb() and writeb() that the h8300 architecture uses. This allows us to test compile this driver on other architectures besides h8300.
Cc Yoshinori Sato <[email protected]>
Signed-off-by Stephen Boyd <[email protected]>
--- drivers/clk/h8300/clk-h8s2678.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/clk/h8300/clk-h8s2678.c +5 -5
@@ -28,7 +28,7 @@ static unsigned long pll_recalc_rate(struct clk_hw *hw, unsigned long parent_rate) {struct pll_clock *pll_clock =to_pll_clock (hw); -int mul =1 << (ctrl_inb ((unsigned long )pll_clock->pllcr) &3 ); +int mul =1 << (readb (pll_clock->pllcr) &3 );return parent_rate * mul; }
@@ -65,13 +65,13 @@ static int pll_set_rate(struct clk_hw *hw, unsigned long rate, pll = ((rate / parent_rate) /2 ) &0x03 ;spin_lock_irqsave (&clklock, flags); - val =ctrl_inb ((unsigned long )pll_clock->sckcr); + val =readb (pll_clock->sckcr); val |=0x08 ; -ctrl_outb (val, (unsigned long )pll_clock->sckcr); - val =ctrl_inb ((unsigned long )pll_clock->pllcr); +writeb (val, pll_clock->sckcr); + val =readb (pll_clock->pllcr); val &= ~0x03 ; val |= pll; -ctrl_outb (val, (unsigned long )pll_clock->pllcr); +writeb (val, pll_clock->pllcr);spin_unlock_irqrestore (&clklock, flags);return 0 ; }
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project