diff options
author | Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com> | 2013-10-17 18:35:26 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2013-10-17 19:40:35 -0400 |
commit | d8059302b374b351731ba503bb6f5bc88962d983 (patch) | |
tree | 03b8b99e2f88275b8d8007f33839d0427a18c0f7 | |
parent | 001d4c7aea587ce0865c07ec45aa56ecbefd431a (diff) |
mrst: Fixed indentation issues
Fixed indentation issues reported by checkpatch script in
mrst related files.
Signed-off-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Link: http://lkml.kernel.org/r/1382049336-21316-3-git-send-email-david.a.cohen@linux.intel.com
Signed-off-by: David Cohen <david.a.cohen@linux.intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
-rw-r--r-- | arch/x86/platform/mrst/early_printk_mrst.c | 3 | ||||
-rw-r--r-- | arch/x86/platform/mrst/mrst.c | 24 |
2 files changed, 15 insertions, 12 deletions
diff --git a/arch/x86/platform/mrst/early_printk_mrst.c b/arch/x86/platform/mrst/early_printk_mrst.c index 95880f7f34de..39ecc276cd84 100644 --- a/arch/x86/platform/mrst/early_printk_mrst.c +++ b/arch/x86/platform/mrst/early_printk_mrst.c | |||
@@ -219,7 +219,8 @@ static void early_mrst_spi_putc(char c) | |||
219 | } | 219 | } |
220 | 220 | ||
221 | /* Early SPI only uses polling mode */ | 221 | /* Early SPI only uses polling mode */ |
222 | static void early_mrst_spi_write(struct console *con, const char *str, unsigned n) | 222 | static void early_mrst_spi_write(struct console *con, const char *str, |
223 | unsigned n) | ||
223 | { | 224 | { |
224 | int i; | 225 | int i; |
225 | 226 | ||
diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c index b9aeb5464d82..235a74244777 100644 --- a/arch/x86/platform/mrst/mrst.c +++ b/arch/x86/platform/mrst/mrst.c | |||
@@ -131,7 +131,7 @@ struct sfi_timer_table_entry *sfi_get_mtmr(int hint) | |||
131 | int i; | 131 | int i; |
132 | if (hint < sfi_mtimer_num) { | 132 | if (hint < sfi_mtimer_num) { |
133 | if (!sfi_mtimer_usage[hint]) { | 133 | if (!sfi_mtimer_usage[hint]) { |
134 | pr_debug("hint taken for timer %d irq %d\n",\ | 134 | pr_debug("hint taken for timer %d irq %d\n", |
135 | hint, sfi_mtimer_array[hint].irq); | 135 | hint, sfi_mtimer_array[hint].irq); |
136 | sfi_mtimer_usage[hint] = 1; | 136 | sfi_mtimer_usage[hint] = 1; |
137 | return &sfi_mtimer_array[hint]; | 137 | return &sfi_mtimer_array[hint]; |
@@ -679,14 +679,14 @@ static void *msic_thermal_platform_data(void *info) | |||
679 | /* tc35876x DSI-LVDS bridge chip and panel platform data */ | 679 | /* tc35876x DSI-LVDS bridge chip and panel platform data */ |
680 | static void *tc35876x_platform_data(void *data) | 680 | static void *tc35876x_platform_data(void *data) |
681 | { | 681 | { |
682 | static struct tc35876x_platform_data pdata; | 682 | static struct tc35876x_platform_data pdata; |
683 | 683 | ||
684 | /* gpio pins set to -1 will not be used by the driver */ | 684 | /* gpio pins set to -1 will not be used by the driver */ |
685 | pdata.gpio_bridge_reset = get_gpio_by_name("LCMB_RXEN"); | 685 | pdata.gpio_bridge_reset = get_gpio_by_name("LCMB_RXEN"); |
686 | pdata.gpio_panel_bl_en = get_gpio_by_name("6S6P_BL_EN"); | 686 | pdata.gpio_panel_bl_en = get_gpio_by_name("6S6P_BL_EN"); |
687 | pdata.gpio_panel_vadd = get_gpio_by_name("EN_VREG_LCD_V3P3"); | 687 | pdata.gpio_panel_vadd = get_gpio_by_name("EN_VREG_LCD_V3P3"); |
688 | 688 | ||
689 | return &pdata; | 689 | return &pdata; |
690 | } | 690 | } |
691 | 691 | ||
692 | static const struct devs_id __initconst device_ids[] = { | 692 | static const struct devs_id __initconst device_ids[] = { |
@@ -729,7 +729,7 @@ static int i2c_next_dev; | |||
729 | 729 | ||
730 | static void __init intel_scu_device_register(struct platform_device *pdev) | 730 | static void __init intel_scu_device_register(struct platform_device *pdev) |
731 | { | 731 | { |
732 | if(ipc_next_dev == MAX_IPCDEVS) | 732 | if (ipc_next_dev == MAX_IPCDEVS) |
733 | pr_err("too many SCU IPC devices"); | 733 | pr_err("too many SCU IPC devices"); |
734 | else | 734 | else |
735 | ipc_devs[ipc_next_dev++] = pdev; | 735 | ipc_devs[ipc_next_dev++] = pdev; |
@@ -872,7 +872,8 @@ static void __init sfi_handle_spi_dev(struct spi_board_info *spi_info) | |||
872 | 872 | ||
873 | while (dev->name[0]) { | 873 | while (dev->name[0]) { |
874 | if (dev->type == SFI_DEV_TYPE_SPI && | 874 | if (dev->type == SFI_DEV_TYPE_SPI && |
875 | !strncmp(dev->name, spi_info->modalias, SFI_NAME_LEN)) { | 875 | !strncmp(dev->name, spi_info->modalias, |
876 | SFI_NAME_LEN)) { | ||
876 | pdata = dev->get_platform_data(spi_info); | 877 | pdata = dev->get_platform_data(spi_info); |
877 | break; | 878 | break; |
878 | } | 879 | } |
@@ -904,7 +905,7 @@ static void __init sfi_handle_i2c_dev(int bus, struct i2c_board_info *i2c_info) | |||
904 | intel_scu_i2c_device_register(bus, i2c_info); | 905 | intel_scu_i2c_device_register(bus, i2c_info); |
905 | else | 906 | else |
906 | i2c_register_board_info(bus, i2c_info, 1); | 907 | i2c_register_board_info(bus, i2c_info, 1); |
907 | } | 908 | } |
908 | 909 | ||
909 | 910 | ||
910 | static int __init sfi_parse_devs(struct sfi_table_header *table) | 911 | static int __init sfi_parse_devs(struct sfi_table_header *table) |
@@ -1034,7 +1035,8 @@ static int __init pb_keys_init(void) | |||
1034 | num = sizeof(gpio_button) / sizeof(struct gpio_keys_button); | 1035 | num = sizeof(gpio_button) / sizeof(struct gpio_keys_button); |
1035 | for (i = 0; i < num; i++) { | 1036 | for (i = 0; i < num; i++) { |
1036 | gb[i].gpio = get_gpio_by_name(gb[i].desc); | 1037 | gb[i].gpio = get_gpio_by_name(gb[i].desc); |
1037 | pr_debug("info[%2d]: name = %s, gpio = %d\n", i, gb[i].desc, gb[i].gpio); | 1038 | pr_debug("info[%2d]: name = %s, gpio = %d\n", i, gb[i].desc, |
1039 | gb[i].gpio); | ||
1038 | if (gb[i].gpio == -1) | 1040 | if (gb[i].gpio == -1) |
1039 | continue; | 1041 | continue; |
1040 | 1042 | ||