Input: pxrc - do not store unneeded data in driver structure (c8783d39) · Commits · 戴 / test

drivers/input/joystick/pxrc.c

+17 −18

Original line number	Original line	Diff line number	Diff line
	@@ -25,15 +25,13 @@ struct pxrc {
	struct urb *urb;		struct urb *urb;
	struct mutex pm_mutex;		struct mutex pm_mutex;
	bool is_open;		bool is_open;
	__u8 epaddr;
	char phys[64];		char phys[64];
	unsigned char *data;
	size_t bsize;
	};		};

	static void pxrc_usb_irq(struct urb *urb)		static void pxrc_usb_irq(struct urb *urb)
	{		{
	struct pxrc *pxrc = urb->context;		struct pxrc *pxrc = urb->context;
			u8 *data = urb->transfer_buffer;
	int error;		int error;

	switch (urb->status) {		switch (urb->status) {
	@@ -61,15 +59,15 @@ static void pxrc_usb_irq(struct urb *urb)
	}		}

	if (urb->actual_length == 8) {		if (urb->actual_length == 8) {
	input_report_abs(pxrc->input, ABS_X, pxrc->data[0]);		input_report_abs(pxrc->input, ABS_X, data[0]);
	input_report_abs(pxrc->input, ABS_Y, pxrc->data[2]);		input_report_abs(pxrc->input, ABS_Y, data[2]);
	input_report_abs(pxrc->input, ABS_RX, pxrc->data[3]);		input_report_abs(pxrc->input, ABS_RX, data[3]);
	input_report_abs(pxrc->input, ABS_RY, pxrc->data[4]);		input_report_abs(pxrc->input, ABS_RY, data[4]);
	input_report_abs(pxrc->input, ABS_RUDDER, pxrc->data[5]);		input_report_abs(pxrc->input, ABS_RUDDER, data[5]);
	input_report_abs(pxrc->input, ABS_THROTTLE, pxrc->data[6]);		input_report_abs(pxrc->input, ABS_THROTTLE, data[6]);
	input_report_abs(pxrc->input, ABS_MISC, pxrc->data[7]);		input_report_abs(pxrc->input, ABS_MISC, data[7]);

	input_report_key(pxrc->input, BTN_A, pxrc->data[1]);		input_report_key(pxrc->input, BTN_A, data[1]);
	}		}

	exit:		exit:
	@@ -124,6 +122,8 @@ static int pxrc_usb_init(struct pxrc *pxrc)
	{		{
	struct usb_device *udev = interface_to_usbdev(pxrc->intf);		struct usb_device *udev = interface_to_usbdev(pxrc->intf);
	struct usb_endpoint_descriptor *epirq;		struct usb_endpoint_descriptor *epirq;
			size_t xfer_size;
			void *xfer_buf;
	unsigned int pipe;		unsigned int pipe;
	int error;		int error;

	@@ -136,10 +136,9 @@ static int pxrc_usb_init(struct pxrc *pxrc)
	return error;		return error;
	}		}

	pxrc->bsize = usb_endpoint_maxp(epirq);		xfer_size = usb_endpoint_maxp(epirq);
	pxrc->epaddr = epirq->bEndpointAddress;		xfer_buf = devm_kmalloc(&pxrc->intf->dev, xfer_size, GFP_KERNEL);
	pxrc->data = devm_kmalloc(&pxrc->intf->dev, pxrc->bsize, GFP_KERNEL);		if (!xfer_buf)
	if (!pxrc->data)
	return -ENOMEM;		return -ENOMEM;

	usb_set_intfdata(pxrc->intf, pxrc);		usb_set_intfdata(pxrc->intf, pxrc);
	@@ -154,8 +153,8 @@ static int pxrc_usb_init(struct pxrc *pxrc)
	if (error)		if (error)
	return error;		return error;

	pipe = usb_rcvintpipe(udev, pxrc->epaddr),		pipe = usb_rcvintpipe(udev, epirq->bEndpointAddress),
	usb_fill_int_urb(pxrc->urb, udev, pipe, pxrc->data, pxrc->bsize,		usb_fill_int_urb(pxrc->urb, udev, pipe, xfer_buf, xfer_size,
	pxrc_usb_irq, pxrc, 1);		pxrc_usb_irq, pxrc, 1);

	return 0;		return 0;

Admin message