tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[ARM] pxa: merge common cpu_is_pxa255() code together

Signed-off-by: Eric Miao <eric.miao@marvell.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

authored by

Eric Miao and committed by
Russell King 2b12797c 2276f03b

+4 -6
+4 -6
arch/arm/mach-pxa/pxa25x.c
··· 348 348 { 349 349 int i, ret = 0; 350 350 351 - /* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */ 352 - if (cpu_is_pxa255()) 353 - clks_register(&pxa25x_hwuart_clk, 1); 354 - 355 351 if (cpu_is_pxa21x() || cpu_is_pxa25x()) { 356 352 357 353 reset_status = RCSR; ··· 371 375 return ret; 372 376 } 373 377 374 - /* Only add HWUART for PXA255/26x; PXA210/250/27x do not have it. */ 375 - if (cpu_is_pxa255()) 378 + /* Only add HWUART for PXA255/26x; PXA210/250 do not have it. */ 379 + if (cpu_is_pxa255()) { 380 + clks_register(&pxa25x_hwuart_clk, 1); 376 381 ret = platform_device_register(&pxa_device_hwuart); 382 + } 377 383 378 384 return ret; 379 385 }