Skip to contentSkip to conversation

tsc210x build fixes

PATCH In review David Brownell 2 participants 2 messages Nov 24, 2007 – Nov 28, 2007

Subsystems (2)
Input drivers Hardware monitoring
lore
Share & tools
lore

David Brownell

author
#0 lore raw

PATCH 1/1 tsc210x build fixes

Build fixes for the tsc210x driver.

Signed-off-by David Brownell <[email protected]>
drivers/hwmon/tsc210x_sensors.c +1 -1
@@ -41,7 +41,7 @@ #include <linux/spi/tsc210x.h>
 struct tsc210x_hwmon {
 	int bat[2], aux[2], temp[2];
 
-	struct class_device *dev;
+	struct device *dev;
 	struct tsc210x_config *pdata;
 #ifdef CONFIG_APM
 	/* prevent APM from colliding with normal hwmon accessors */
drivers/input/touchscreen/tsc210x_ts.c +1 -1
@@ -96,7 +96,7 @@ static int tsc210x_ts_probe(struct platf
 	dev->name = "TSC210x Touchscreen";
 	dev->cdev.dev = &pdev->dev;
 	dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-	dev->keybit[LONG(BTN_TOUCH)] |= BIT(BTN_TOUCH);
+	dev->keybit[BIT_WORD(BTN_TOUCH)] |= BIT_MASK(BTN_TOUCH);
 	dev->absbit[0] = BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_PRESSURE);
 	dev->phys = "tsc210x/input0";
 	dev->id.bustype = BUS_HOST;
#1 lore raw
Quoted 18 lines · David Brownell

Build fixes for the tsc210x driver.

Signed-off-by David Brownell <[email protected]>
drivers/hwmon/tsc210x_sensors.c +1 -1
@@ -41,7 +41,7 @@ #include <linux/spi/tsc210x.h>
 struct tsc210x_hwmon {
 	int bat[2], aux[2], temp[2];
 
-	struct class_device *dev;
+	struct device *dev;
 	struct tsc210x_config *pdata;
 #ifdef CONFIG_APM
 	/* prevent APM from colliding with normal hwmon accessors */

drivers/input/touchscreen/tsc210x_ts.c static int tsc210x_ts_probe(struct platf · line 102

Quoted 8 lines
drivers/input/touchscreen/tsc210x_ts.c +1 -1
@@ -96,7 +96,7 @@ static int tsc210x_ts_probe(struct platf
 	dev->name = "TSC210x Touchscreen";
 	dev->cdev.dev = &pdev->dev;
 	dev->evbit[0] = BIT(EV_KEY) | BIT(EV_ABS);
-	dev->keybit[LONG(BTN_TOUCH)] |= BIT(BTN_TOUCH);
+	dev->keybit[BIT_WORD(BTN_TOUCH)] |= BIT_MASK(BTN_TOUCH);
 	dev->absbit[0] = BIT(ABS_X) | BIT(ABS_Y) | BIT(ABS_PRESSURE);
 	dev->phys = "tsc210x/input0";
 	dev->id.bustype = BUS_HOST;

Pushing today.

Tony