Indentation: Various indentation fixes

Fixed indentation using indent tool in the src/drivers/i2c tree

Change-Id: I5b396e5753544aff13ac5d16afc59e193a6b1da1
Signed-off-by: Vikram Narayanan <vikram186@gmail.com>
Reviewed-on: http://review.coreboot.org/506
Tested-by: build bot (Jenkins)
Reviewed-by: Kerry Sheh <shekairui@gmail.com>
Reviewed-by: Marc Jones <marcj303@gmail.com>
This commit is contained in:
Vikram Narayanan 2011-12-26 22:52:01 +05:30 committed by Marc Jones
parent 7bfd22e4c6
commit 0786bc6ad8
6 changed files with 61 additions and 68 deletions

View File

@ -7,7 +7,7 @@
#include <cpu/x86/msr.h> #include <cpu/x86/msr.h>
#include "chip.h" #include "chip.h"
#define ADM1026_DEVICE 0x2d /* Either 0x2c or 0x2d or 0x2e */ #define ADM1026_DEVICE 0x2d /* Either 0x2c or 0x2d or 0x2e */
#define ADM1026_REG_CONFIG1 0x00 #define ADM1026_REG_CONFIG1 0x00
#define CFG1_MONITOR 0x01 #define CFG1_MONITOR 0x01
#define CFG1_INT_ENABLE 0x02 #define CFG1_INT_ENABLE 0x02
@ -24,38 +24,38 @@ static void adm1026_enable_monitoring(device_t dev);
static void adm1026_init(device_t dev) static void adm1026_init(device_t dev)
{ {
if (dev->enabled && dev->path.type == DEVICE_PATH_I2C) if (dev->enabled && dev->path.type == DEVICE_PATH_I2C) {
{ if (ops_smbus_bus(get_pbus_smbus(dev))) {
if(ops_smbus_bus(get_pbus_smbus(dev))) { if (dev->bus->dev->path.type == DEVICE_PATH_I2C)
if( dev->bus->dev->path.type == DEVICE_PATH_I2C) smbus_set_link(dev); // it is under mux smbus_set_link(dev); // it is under mux
adm1026_enable_monitoring(dev); adm1026_enable_monitoring(dev);
} }
} }
} }
static void adm1026_enable_monitoring(device_t dev) static void adm1026_enable_monitoring(device_t dev)
{ {
int result; int result;
result = smbus_read_byte(dev, ADM1026_REG_CONFIG1); result = smbus_read_byte(dev, ADM1026_REG_CONFIG1);
result = (result | CFG1_MONITOR) & ~(CFG1_INT_CLEAR | CFG1_RESET); result = (result | CFG1_MONITOR) & ~(CFG1_INT_CLEAR | CFG1_RESET);
result = smbus_write_byte(dev, ADM1026_REG_CONFIG1, result); result = smbus_write_byte(dev, ADM1026_REG_CONFIG1, result);
result = smbus_read_byte(dev, ADM1026_REG_CONFIG1); result = smbus_read_byte(dev, ADM1026_REG_CONFIG1);
if (!(result & CFG1_MONITOR)) { if (!(result & CFG1_MONITOR)) {
printk(BIOS_DEBUG, "ADM1026: monitoring would not enable"); printk(BIOS_DEBUG, "ADM1026: monitoring would not enable");
} }
} }
static void adm1026_noop(device_t dummy) static void adm1026_noop(device_t dummy)
{ {
} }
static struct device_operations adm1026_operations = { static struct device_operations adm1026_operations = {
.read_resources = adm1026_noop, .read_resources = adm1026_noop,
.set_resources = adm1026_noop, .set_resources = adm1026_noop,
.enable_resources = adm1026_noop, .enable_resources = adm1026_noop,
.init = adm1026_init, .init = adm1026_init,
}; };
static void enable_dev(struct device *dev) static void enable_dev(struct device *dev)

View File

@ -47,7 +47,6 @@ static void adm1027_init(device_t dev)
smbus_set_link(dev); // it is under mux smbus_set_link(dev); // it is under mux
adm1027_enable_monitoring(dev); adm1027_enable_monitoring(dev);
} }
} }
} }
@ -56,10 +55,10 @@ static void adm1027_noop(device_t dummy)
} }
static struct device_operations adm1027_operations = { static struct device_operations adm1027_operations = {
.read_resources = adm1027_noop, .read_resources = adm1027_noop,
.set_resources = adm1027_noop, .set_resources = adm1027_noop,
.enable_resources = adm1027_noop, .enable_resources = adm1027_noop,
.init = adm1027_init, .init = adm1027_init,
}; };
static void enable_dev(struct device *dev) static void enable_dev(struct device *dev)

View File

@ -91,10 +91,10 @@ static void adt7463_noop(device_t dummy)
} }
static struct device_operations adt7463_operations = { static struct device_operations adt7463_operations = {
.read_resources = adt7463_noop, .read_resources = adt7463_noop,
.set_resources = adt7463_noop, .set_resources = adt7463_noop,
.enable_resources = adt7463_noop, .enable_resources = adt7463_noop,
.init = adt7463_init, .init = adt7463_init,
}; };
static void enable_dev(struct device *dev) static void enable_dev(struct device *dev)

View File

@ -9,32 +9,30 @@
static void i2cmux_set_link(device_t dev, unsigned int link) static void i2cmux_set_link(device_t dev, unsigned int link)
{ {
if (dev->enabled && dev->path.type == DEVICE_PATH_I2C) if (dev->enabled && dev->path.type == DEVICE_PATH_I2C) {
{ if (ops_smbus_bus(get_pbus_smbus(dev))) {
if(ops_smbus_bus(get_pbus_smbus(dev))) { smbus_write_byte(dev, 0x01, 1 << link); // output value
smbus_write_byte(dev, 0x01, 1<<link); // output value smbus_write_byte(dev, 0x03, 0); // all output
smbus_write_byte(dev, 0x03, 0); // all output
} }
} }
} }
static void i2cmux_noop(device_t dummy) static void i2cmux_noop(device_t dummy)
{ {
} }
static struct device_operations i2cmux_operations = { static struct device_operations i2cmux_operations = {
.read_resources = i2cmux_noop, .read_resources = i2cmux_noop,
.set_resources = i2cmux_noop, .set_resources = i2cmux_noop,
.enable_resources = i2cmux_noop, .enable_resources = i2cmux_noop,
.init = i2cmux_noop, .init = i2cmux_noop,
.scan_bus = scan_static_bus, .scan_bus = scan_static_bus,
.set_link = i2cmux_set_link, .set_link = i2cmux_set_link,
}; };
static void enable_dev(struct device *dev) static void enable_dev(struct device *dev)
{ {
if(dev->link_list != NULL) if (dev->link_list != NULL)
dev->ops = &i2cmux_operations; dev->ops = &i2cmux_operations;
} }

View File

@ -9,31 +9,29 @@
static void i2cmux2_set_link(device_t dev, unsigned int link) static void i2cmux2_set_link(device_t dev, unsigned int link)
{ {
if (dev->enabled && dev->path.type == DEVICE_PATH_I2C) if (dev->enabled && dev->path.type == DEVICE_PATH_I2C) {
{ if (ops_smbus_bus(get_pbus_smbus(dev))) {
if(ops_smbus_bus(get_pbus_smbus(dev))) { smbus_send_byte(dev, link); // output value
smbus_send_byte(dev, link); // output value
} }
} }
} }
static void i2cmux2_noop(device_t dummy) static void i2cmux2_noop(device_t dummy)
{ {
} }
static struct device_operations i2cmux2_operations = { static struct device_operations i2cmux2_operations = {
.read_resources = i2cmux2_noop, .read_resources = i2cmux2_noop,
.set_resources = i2cmux2_noop, .set_resources = i2cmux2_noop,
.enable_resources = i2cmux2_noop, .enable_resources = i2cmux2_noop,
.init = i2cmux2_noop, .init = i2cmux2_noop,
.scan_bus = scan_static_bus, .scan_bus = scan_static_bus,
.set_link = i2cmux2_set_link, .set_link = i2cmux2_set_link,
}; };
static void enable_dev(struct device *dev) static void enable_dev(struct device *dev)
{ {
if(dev->link_list != NULL) if (dev->link_list != NULL)
dev->ops = &i2cmux2_operations; dev->ops = &i2cmux2_operations;
} }

View File

@ -7,32 +7,30 @@
#include <cpu/x86/msr.h> #include <cpu/x86/msr.h>
#include "chip.h" #include "chip.h"
static void lm63_init(device_t dev) static void lm63_init(device_t dev)
{ {
int result; int result;
if (dev->enabled && dev->path.type == DEVICE_PATH_I2C) if (dev->enabled && dev->path.type == DEVICE_PATH_I2C) {
{ if (ops_smbus_bus(get_pbus_smbus(dev))) {
if(ops_smbus_bus(get_pbus_smbus(dev))) { if (dev->bus->dev->path.type == DEVICE_PATH_I2C)
if( dev->bus->dev->path.type == DEVICE_PATH_I2C) smbus_set_link(dev); // it is under mux smbus_set_link(dev); // it is under mux
result = smbus_read_byte(dev, 0x03); result = smbus_read_byte(dev, 0x03);
// result &= ~0x04; // result &= ~0x04;
result |= 0x04; result |= 0x04;
smbus_write_byte(dev, 0x03, result & 0xff); // config lm63 smbus_write_byte(dev, 0x03, result & 0xff); // config lm63
} }
} }
} }
static void lm63_noop(device_t dummy) static void lm63_noop(device_t dummy)
{ {
} }
static struct device_operations lm63_operations = { static struct device_operations lm63_operations = {
.read_resources = lm63_noop, .read_resources = lm63_noop,
.set_resources = lm63_noop, .set_resources = lm63_noop,
.enable_resources = lm63_noop, .enable_resources = lm63_noop,
.init = lm63_init, .init = lm63_init,
}; };
static void enable_dev(struct device *dev) static void enable_dev(struct device *dev)