Skip to content

L
linux
Commit e63cedb6 authored by Russell King's avatar Russell King Committed by Russell King
Browse files
Options

[ARM] collie: fix two minor formatting nits 

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 17a92a78
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 3 deletions
arch/arm/mach-sa1100/collie.c
View file @ e63cedb6
...@@ -146,7 +146,8 @@ static struct locomo_driver collie_uart_driver = { ...@@ -146,7 +146,8 @@ static struct locomo_driver collie_uart_driver = {
.remove = collie_uart_remove, .remove = collie_uart_remove,
}; };
static int __init collie_uart_init(void) { static int __init collie_uart_init(void)
{
return locomo_driver_register(&collie_uart_driver); return locomo_driver_register(&collie_uart_driver);
} }
device_initcall(collie_uart_init); device_initcall(collie_uart_init);
...@@ -198,8 +199,7 @@ static struct mtd_partition collie_partitions[] = { ...@@ -198,8 +199,7 @@ static struct mtd_partition collie_partitions[] = {
static int collie_flash_init(void) static int collie_flash_init(void)
{ {
int rc; int rc = gpio_request(COLLIE_GPIO_VPEN, "flash Vpp enable");
rc = gpio_request(COLLIE_GPIO_VPEN, "flash Vpp enable");
if (rc) if (rc)
return rc; return rc;
...@@ -219,6 +219,7 @@ static void collie_flash_exit(void) ...@@ -219,6 +219,7 @@ static void collie_flash_exit(void)
{ {
gpio_free(COLLIE_GPIO_VPEN); gpio_free(COLLIE_GPIO_VPEN);
} }
static struct flash_platform_data collie_flash_data = { static struct flash_platform_data collie_flash_data = {
.map_name = "cfi_probe", .map_name = "cfi_probe",
.init = collie_flash_init, .init = collie_flash_init,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7