aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/i2c
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2016-06-15 11:05:07 -0400
committerWolfram Sang <wsa@the-dreams.de>2016-06-19 13:41:51 -0400
commit45bc35ef0d14423cb3fbdba14112261f387d536e (patch)
tree7e257140dc7d5157a09dbc67bb19d1c59a9d2afc /drivers/i2c
parentb20551c184f5e9ebe75e385fd5af74640be1ec31 (diff)
i2c: designware-pci: Sort header block alphabetically
Simply sort header block alphabetically. While here fix an indentation in one place and update a copyright line for Intel. Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Acked-by: Jarkko Nikula <jarkko.nikula@linux.intel.com> Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Diffstat (limited to 'drivers/i2c')
-rw-r--r--drivers/i2c/busses/i2c-designware-pcidrv.c19
1 files changed, 10 insertions, 9 deletions
diff --git a/drivers/i2c/busses/i2c-designware-pcidrv.c b/drivers/i2c/busses/i2c-designware-pcidrv.c
index a7aab105f73b..b66c31acb184 100644
--- a/drivers/i2c/busses/i2c-designware-pcidrv.c
+++ b/drivers/i2c/busses/i2c-designware-pcidrv.c
@@ -6,7 +6,7 @@
6 * Copyright (C) 2006 Texas Instruments. 6 * Copyright (C) 2006 Texas Instruments.
7 * Copyright (C) 2007 MontaVista Software Inc. 7 * Copyright (C) 2007 MontaVista Software Inc.
8 * Copyright (C) 2009 Provigent Ltd. 8 * Copyright (C) 2009 Provigent Ltd.
9 * Copyright (C) 2011, 2015 Intel Corporation. 9 * Copyright (C) 2011, 2015, 2016 Intel Corporation.
10 * 10 *
11 * ---------------------------------------------------------------------------- 11 * ----------------------------------------------------------------------------
12 * 12 *
@@ -23,19 +23,20 @@
23 * 23 *
24 */ 24 */
25 25
26#include <linux/kernel.h> 26#include <linux/acpi.h>
27#include <linux/module.h>
28#include <linux/delay.h> 27#include <linux/delay.h>
29#include <linux/i2c.h>
30#include <linux/errno.h>
31#include <linux/sched.h>
32#include <linux/err.h> 28#include <linux/err.h>
29#include <linux/errno.h>
30#include <linux/i2c.h>
33#include <linux/interrupt.h> 31#include <linux/interrupt.h>
34#include <linux/io.h> 32#include <linux/io.h>
35#include <linux/slab.h> 33#include <linux/kernel.h>
34#include <linux/module.h>
36#include <linux/pci.h> 35#include <linux/pci.h>
37#include <linux/pm_runtime.h> 36#include <linux/pm_runtime.h>
38#include <linux/acpi.h> 37#include <linux/sched.h>
38#include <linux/slab.h>
39
39#include "i2c-designware-core.h" 40#include "i2c-designware-core.h"
40 41
41#define DRIVER_NAME "i2c-designware-pci" 42#define DRIVER_NAME "i2c-designware-pci"
@@ -206,7 +207,7 @@ static int i2c_dw_pci_probe(struct pci_dev *pdev,
206 struct dw_i2c_dev *dev; 207 struct dw_i2c_dev *dev;
207 struct i2c_adapter *adap; 208 struct i2c_adapter *adap;
208 int r; 209 int r;
209 struct dw_pci_controller *controller; 210 struct dw_pci_controller *controller;
210 struct dw_scl_sda_cfg *cfg; 211 struct dw_scl_sda_cfg *cfg;
211 212
212 if (id->driver_data >= ARRAY_SIZE(dw_pci_controllers)) { 213 if (id->driver_data >= ARRAY_SIZE(dw_pci_controllers)) {