Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 644b55ce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input:
  Input: psmouse - make dummy touchkit_ps2_detect() static
  Input: gscps2 - convert to use kzalloc
  Input: iforce - fix 'unused variable' warning
  Input: i8042 - fix retrun value of i8042_aux_test_irq
  Input: gpio_keys - remove duplicate includes
parents feabb06b b3e2c70c

drivers/input/joystick/iforce/iforce-packets.c

+4 −4
Original line number Diff line number Diff line
@@ -246,13 +246,12 @@ void iforce_process_packet(struct iforce *iforce, u16 cmd, unsigned char *data) 


int iforce_get_id_packet(struct iforce *iforce, char *packet)

{

	int status;



	switch (iforce->bus) {



	case IFORCE_USB:



	case IFORCE_USB: {

#ifdef CONFIG_JOYSTICK_IFORCE_USB

		int status;



		iforce->cr.bRequest = packet[0];

		iforce->ctrl->dev = iforce->usbdev;
@@ -273,6 +272,7 @@ int iforce_get_id_packet(struct iforce *iforce, char *packet) 
#else

		dbg("iforce_get_id_packet: iforce->bus = USB!");

#endif

		}

		break;



	case IFORCE_232:

drivers/input/keyboard/gpio_keys.c

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/delay.h>

#include <linux/platform_device.h>

#include <linux/input.h>

#include <linux/irq.h>

#include <linux/gpio_keys.h>



#include <asm/gpio.h>

drivers/input/mouse/touchkit_ps2.h

+2 −1
Original line number Diff line number Diff line
@@ -15,7 +15,8 @@ 
#ifdef CONFIG_MOUSE_PS2_TOUCHKIT

int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties);

#else

inline int touchkit_ps2_detect(struct psmouse *psmouse, int set_properties)

static inline int touchkit_ps2_detect(struct psmouse *psmouse,

				      int set_properties)

{

	return -ENOSYS;

}

drivers/input/serio/gscps2.c

+2 −4
Original line number Diff line number Diff line
@@ -340,8 +340,8 @@ static int __init gscps2_probe(struct parisc_device *dev) 
	if (dev->id.sversion == 0x96)

		hpa += GSC_DINO_OFFSET;



	ps2port = kmalloc(sizeof(struct gscps2port), GFP_KERNEL);

	serio = kmalloc(sizeof(struct serio), GFP_KERNEL);

	ps2port = kzalloc(sizeof(struct gscps2port), GFP_KERNEL);

	serio = kzalloc(sizeof(struct serio), GFP_KERNEL);

	if (!ps2port || !serio) {

		ret = -ENOMEM;

		goto fail_nomem;
@@ -349,8 +349,6 @@ static int __init gscps2_probe(struct parisc_device *dev) 


	dev_set_drvdata(&dev->dev, ps2port);



	memset(ps2port, 0, sizeof(struct gscps2port));

	memset(serio, 0, sizeof(struct serio));

	ps2port->port = serio;

	ps2port->padev = dev;

	ps2port->addr = ioremap_nocache(hpa, GSC_STATUS + 4);

drivers/input/serio/i8042.c

+3 −1
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id) 
{

	unsigned long flags;

	unsigned char str, data;

	int ret = 0;



	spin_lock_irqsave(&i8042_lock, flags);

	str = i8042_read_status();
@@ -520,10 +521,11 @@ static irqreturn_t __devinit i8042_aux_test_irq(int irq, void *dev_id) 
		if (i8042_irq_being_tested &&

		    data == 0xa5 && (str & I8042_STR_AUXDATA))

			complete(&i8042_aux_irq_delivered);

		ret = 1;

	}

	spin_unlock_irqrestore(&i8042_lock, flags);



	return IRQ_HANDLED;

	return IRQ_RETVAL(ret);

}



/*