Input: psmouse - use boolean type (b7802c5c) · Commits · e / devices / android_kernel_teracube_2e

drivers/input/mouse/alps.c

+12 −8

Original line number	Diff line number	Diff line
		@@ -279,7 +279,7 @@ static const struct alps_model_info alps_get_model(struct psmouse psmouse, int
		* subsequent commands. It looks like glidepad is behind stickpointer,
		* I'd thought it would be other way around...
		*/
		static int alps_passthrough_mode(struct psmouse *psmouse, int enable)
		static int alps_passthrough_mode(struct psmouse *psmouse, bool enable)
		{
		struct ps2dev *ps2dev = &psmouse->ps2dev;
		int cmd = enable ? PSMOUSE_CMD_SETSCALE21 : PSMOUSE_CMD_SETSCALE11;
		@@ -367,16 +367,16 @@ static int alps_poll(struct psmouse *psmouse)
		{
		struct alps_data *priv = psmouse->private;
		unsigned char buf[6];
		int poll_failed;
		bool poll_failed;

		if (priv->i->flags & ALPS_PASS)
		alps_passthrough_mode(psmouse, 1);
		alps_passthrough_mode(psmouse, true);

		poll_failed = ps2_command(&psmouse->ps2dev, buf,
		PSMOUSE_CMD_POLL \| (psmouse->pktsize << 8)) < 0;

		if (priv->i->flags & ALPS_PASS)
		alps_passthrough_mode(psmouse, 0);
		alps_passthrough_mode(psmouse, false);

		if (poll_failed \|\| (buf[0] & priv->i->mask0) != priv->i->byte0)
		return -1;
		@@ -401,10 +401,12 @@ static int alps_hw_init(struct psmouse psmouse, int version)
		if (!priv->i)
		return -1;

		if ((priv->i->flags & ALPS_PASS) && alps_passthrough_mode(psmouse, 1))
		if ((priv->i->flags & ALPS_PASS) &&
		alps_passthrough_mode(psmouse, true)) {
		return -1;
		}

		if (alps_tap_mode(psmouse, 1)) {
		if (alps_tap_mode(psmouse, true)) {
		printk(KERN_WARNING "alps.c: Failed to enable hardware tapping\n");
		return -1;
		}
		@@ -414,8 +416,10 @@ static int alps_hw_init(struct psmouse psmouse, int version)
		return -1;
		}

		if ((priv->i->flags & ALPS_PASS) && alps_passthrough_mode(psmouse, 0))
		if ((priv->i->flags & ALPS_PASS) &&
		alps_passthrough_mode(psmouse, false)) {
		return -1;
		}

		/* ALPS needs stream mode, otherwise it won't report any data */
		if (ps2_command(&psmouse->ps2dev, NULL, PSMOUSE_CMD_SETSTREAM)) {
		@@ -519,7 +523,7 @@ int alps_init(struct psmouse *psmouse)
		return -1;
		}

		int alps_detect(struct psmouse *psmouse, int set_properties)
		int alps_detect(struct psmouse *psmouse, bool set_properties)
		{
		int version;
		const struct alps_model_info *model;

drivers/input/mouse/alps.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -26,10 +26,10 @@ struct alps_data {
		};

		#ifdef CONFIG_MOUSE_PS2_ALPS
		int alps_detect(struct psmouse *psmouse, int set_properties);
		int alps_detect(struct psmouse *psmouse, bool set_properties);
		int alps_init(struct psmouse *psmouse);
		#else
		inline int alps_detect(struct psmouse *psmouse, int set_properties)
		inline int alps_detect(struct psmouse *psmouse, bool set_properties)
		{
		return -ENOSYS;
		}

drivers/input/mouse/elantech.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -553,7 +553,7 @@ static struct attribute_group elantech_attr_group = {
		/*
		* Use magic knock to detect Elantech touchpad
		*/
		int elantech_detect(struct psmouse *psmouse, int set_properties)
		int elantech_detect(struct psmouse *psmouse, bool set_properties)
		{
		struct ps2dev *ps2dev = &psmouse->ps2dev;
		unsigned char param[3];

drivers/input/mouse/elantech.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -109,10 +109,10 @@ struct elantech_data {
		};

		#ifdef CONFIG_MOUSE_PS2_ELANTECH
		int elantech_detect(struct psmouse *psmouse, int set_properties);
		int elantech_detect(struct psmouse *psmouse, bool set_properties);
		int elantech_init(struct psmouse *psmouse);
		#else
		static inline int elantech_detect(struct psmouse *psmouse, int set_properties)
		static inline int elantech_detect(struct psmouse *psmouse, bool set_properties)
		{
		return -ENOSYS;
		}

drivers/input/mouse/hgpk.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -367,7 +367,7 @@ static ssize_t hgpk_set_powered(struct psmouse psmouse, void data,
		}

		__PSMOUSE_DEFINE_ATTR(powered, S_IWUSR \| S_IRUGO, NULL,
		hgpk_show_powered, hgpk_set_powered, 0);
		hgpk_show_powered, hgpk_set_powered, false);

		static ssize_t hgpk_trigger_recal_show(struct psmouse *psmouse,
		void data, char buf)
		@@ -396,7 +396,7 @@ static ssize_t hgpk_trigger_recal(struct psmouse psmouse, void data,
		}

		__PSMOUSE_DEFINE_ATTR(recalibrate, S_IWUSR \| S_IRUGO, NULL,
		hgpk_trigger_recal_show, hgpk_trigger_recal, 0);
		hgpk_trigger_recal_show, hgpk_trigger_recal, false);

		static void hgpk_disconnect(struct psmouse *psmouse)
		{
		@@ -489,7 +489,7 @@ int hgpk_init(struct psmouse *psmouse)

		psmouse->private = priv;
		priv->psmouse = psmouse;
		priv->powered = 1;
		priv->powered = true;
		INIT_DELAYED_WORK(&priv->recalib_wq, hgpk_recalib_work);

		err = psmouse_reset(psmouse);
		@@ -532,7 +532,7 @@ static enum hgpk_model_t hgpk_get_model(struct psmouse *psmouse)
		return param[2];
		}

		int hgpk_detect(struct psmouse *psmouse, int set_properties)
		int hgpk_detect(struct psmouse *psmouse, bool set_properties)
		{
		int version;