BigW Consortium Gitlab

Commit d5ac816f by Forest Godfrey

Fix up variable names for updated mangOH Red driver.

parent efa5398f
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#include <linux/platform_data/at24.h> #include <linux/platform_data/at24.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#include <ai2c_platform_data.h> #include "../ai2c_module/linux_driver/ai2c_platform_data.h"
#include "ltc294x-platform-data.h" #include "ltc294x-platform-data.h"
#include "bq24190-platform-data.h" #include "bq24190-platform-data.h"
#include "bq27xxx_battery.h" #include "bq27xxx_battery.h"
...@@ -324,7 +324,7 @@ static int mangoh_red_probe(struct platform_device* pdev) ...@@ -324,7 +324,7 @@ static int mangoh_red_probe(struct platform_device* pdev)
#endif /* ENABLE_IOT_SLOT */ #endif /* ENABLE_IOT_SLOT */
struct gpio_chip *gpio_expander; struct gpio_chip *gpio_expander;
struct i2c_adapter *i2c_adapter_primary, *i2c_adapter_gpio_exp = NULL, struct i2c_adapter *i2c_adapter_primary, *i2c_adapter_gpio_exp = NULL,
*i2c_adapter_batt_charger = NULL; *i2c_adapter_batt_charger = NULL, *i2c_adapter_ai2c = NULL;
dev_info(&pdev->dev, "%s(): probe\n", __func__); dev_info(&pdev->dev, "%s(): probe\n", __func__);
...@@ -402,8 +402,8 @@ static int mangoh_red_probe(struct platform_device* pdev) ...@@ -402,8 +402,8 @@ static int mangoh_red_probe(struct platform_device* pdev)
/* Map the Arduino I2C keyboard */ /* Map the Arduino I2C keyboard */
dev_dbg(&pdev->dev, "mapping arduino i2c keyboard\n"); dev_dbg(&pdev->dev, "mapping arduino i2c keyboard\n");
other_adapter = i2c_get_adapter(MANGOH_RED_I2C_BUS_AI2C_KBD); i2c_adapter_ai2c = i2c_get_adapter(MANGOH_RED_I2C_BUS_AI2C_KBD);
if (!other_adapter) { if (!i2c_adapter_ai2c) {
dev_err(&pdev->dev, dev_err(&pdev->dev,
"Couldn't get I2C bus %d to add the AI2C keyboard.\n", "Couldn't get I2C bus %d to add the AI2C keyboard.\n",
MANGOH_RED_I2C_BUS_GPIO_EXPANDER); MANGOH_RED_I2C_BUS_GPIO_EXPANDER);
...@@ -411,8 +411,8 @@ static int mangoh_red_probe(struct platform_device* pdev) ...@@ -411,8 +411,8 @@ static int mangoh_red_probe(struct platform_device* pdev)
goto cleanup; goto cleanup;
} }
mangoh_red_driver_data.ai2c_keyboard = mangoh_red_driver_data.ai2c_keyboard =
i2c_new_device(other_adapter, &mangoh_red_ai2c_keyboard_devinfo); i2c_new_device(i2c_adapter_ai2c, &mangoh_red_ai2c_keyboard_devinfo);
i2c_put_adapter(other_adapter); i2c_put_adapter(i2c_adapter_ai2c);
if (!mangoh_red_driver_data.ai2c_keyboard) { if (!mangoh_red_driver_data.ai2c_keyboard) {
dev_err(&pdev->dev, "Failed to register %s\n", dev_err(&pdev->dev, "Failed to register %s\n",
mangoh_red_gpio_expander_devinfo.type); mangoh_red_gpio_expander_devinfo.type);
......
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