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

Commit d64bbeb5 authored by Thadeu Lima de Souza Cascardo's avatar Thadeu Lima de Souza Cascardo Committed by Greg Kroah-Hartman
Browse files

jsm: remove remaining flip buffer code 



The flip buffer is not used anymore. Remove its allocation and
declaration in the board structure.

Signed-off-by: default avatarThadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a16913a9

drivers/tty/serial/jsm/jsm.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -88,7 +88,6 @@ enum { 




/* 4 extra for alignment play space */

/* 4 extra for alignment play space */

#define WRITEBUFLEN	((4096) + 4)

#define WRITEBUFLEN	((4096) + 4)

#define MYFLIPLEN	N_TTY_BUF_SIZE





#define JSM_VERSION	"jsm: 1.2-1-INKERNEL"

#define JSM_VERSION	"jsm: 1.2-1-INKERNEL"

#define JSM_PARTNUM	"40002438_A-INKERNEL"

#define JSM_PARTNUM	"40002438_A-INKERNEL"
@@ -150,7 +149,6 @@ struct jsm_board 
	u32		bd_uart_offset;	/* Space between each UART */

	u32		bd_uart_offset;	/* Space between each UART */





	struct jsm_channel *channels[MAXPORTS]; /* array of pointers to our channels. */

	struct jsm_channel *channels[MAXPORTS]; /* array of pointers to our channels. */

	char		*flipbuf;	/* Our flip buffer, alloced if board is found */





	u32		bd_dividend;	/* Board/UARTs specific dividend */

	u32		bd_dividend;	/* Board/UARTs specific dividend */
@@ -177,7 +175,6 @@ struct jsm_board 
#define CH_TX_FIFO_LWM	0x0800		/* TX Fifo is below Low Water	*/

#define CH_TX_FIFO_LWM	0x0800		/* TX Fifo is below Low Water	*/

#define CH_BREAK_SENDING 0x1000		/* Break is being sent		*/

#define CH_BREAK_SENDING 0x1000		/* Break is being sent		*/

#define CH_LOOPBACK 0x2000		/* Channel is in lookback mode	*/

#define CH_LOOPBACK 0x2000		/* Channel is in lookback mode	*/

#define CH_FLIPBUF_IN_USE 0x4000	/* Channel's flipbuf is in use	*/

#define CH_BAUD0	0x08000		/* Used for checking B0 transitions */

#define CH_BAUD0	0x08000		/* Used for checking B0 transitions */





/* Our Read/Error/Write queue sizes */

/* Our Read/Error/Write queue sizes */

drivers/tty/serial/jsm/jsm_driver.c

+0 −18
Original line number Original line Diff line number Diff line
@@ -160,27 +160,10 @@ static int __devinit jsm_probe_one(struct pci_dev *pdev, const struct pci_device 
	dev_info(&pdev->dev, "board %d: Digi Neo (rev %d), irq %d\n",

	dev_info(&pdev->dev, "board %d: Digi Neo (rev %d), irq %d\n",

			adapter_count, brd->rev, brd->irq);

			adapter_count, brd->rev, brd->irq);





	/*

	 * allocate flip buffer for board.

	 *

	 * Okay to malloc with GFP_KERNEL, we are not at interrupt

	 * context, and there are no locks held.

	 */

	brd->flipbuf = kzalloc(MYFLIPLEN, GFP_KERNEL);

	if (!brd->flipbuf) {

		/* XXX: leaking all resources from jsm_tty_init and

		 	jsm_uart_port_init here! */

		dev_err(&pdev->dev, "memory allocation for flipbuf failed\n");

		rc = -ENOMEM;

		goto out_free_uart;

	}



	pci_set_drvdata(pdev, brd);

	pci_set_drvdata(pdev, brd);

	pci_save_state(pdev);

	pci_save_state(pdev);





	return 0;

	return 0;

 out_free_uart:

	jsm_remove_uart_port(brd);

 out_free_irq:

 out_free_irq:

	jsm_remove_uart_port(brd);

	jsm_remove_uart_port(brd);

	free_irq(brd->irq, brd);

	free_irq(brd->irq, brd);
@@ -218,7 +201,6 @@ static void __devexit jsm_remove_one(struct pci_dev *pdev) 




	pci_release_regions(pdev);

	pci_release_regions(pdev);

	pci_disable_device(pdev);

	pci_disable_device(pdev);

	kfree(brd->flipbuf);

	kfree(brd);

	kfree(brd);

}

}