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

Commit e15f51dc authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

staging: dgnc: remove "vpd" board variable 



It was only ever read from the device, and spit out to the kernel log
for no good reason.  So remove it, and the way it was read from the
device, and the now unused "board file" callback.

Cc: Lidza Louina <lidza.louina@gmail.com>
Cc: Mark Hounschell <markh@compro.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1971a951

drivers/staging/dgnc/dgnc_cls.c

+0 −25
Original line number Diff line number Diff line
@@ -1114,30 +1114,6 @@ static void cls_send_immediate_char(struct channel_t *ch, unsigned char c) 
	writeb(c, &ch->ch_cls_uart->txrx);

}



static void cls_vpd(struct dgnc_board *brd)

{

	ulong           vpdbase;        /* Start of io base of the card */

	u8 __iomem           *re_map_vpdbase;/* Remapped memory of the card */

	int i = 0;



	vpdbase = pci_resource_start(brd->pdev, 3);

	if (!vpdbase)

		return;



	re_map_vpdbase = ioremap(vpdbase, 0x400);



	if (!re_map_vpdbase)

		return;



	for (i = 0; i < 0x40; i++) {

		brd->vpd[i] = readb(re_map_vpdbase + i);

		pr_info("%x ", brd->vpd[i]);

	}

	pr_info("\n");



	iounmap(re_map_vpdbase);

}



struct board_ops dgnc_cls_ops = {

	.tasklet =			cls_tasklet,

	.intr =				cls_intr,
@@ -1145,7 +1121,6 @@ struct board_ops dgnc_cls_ops = { 
	.uart_off =			cls_uart_off,

	.drain =			cls_drain,

	.param =			cls_param,

	.vpd =				cls_vpd,

	.assert_modem_signals =		cls_assert_modem_signals,

	.flush_uart_write =		cls_flush_uart_write,

	.flush_uart_read =		cls_flush_uart_read,

drivers/staging/dgnc/dgnc_driver.c

+0 −3
Original line number Diff line number Diff line
@@ -142,9 +142,6 @@ static struct dgnc_board *dgnc_found_board(struct pci_dev *pdev, int id) 
		if (rc < 0)

			goto failed;



		/* Get and store the board VPD, if it exists */

		brd->bd_ops->vpd(brd);



		/*

		 * Enable Local Interrupt 1		  (0x1),

		 * Local Interrupt 1 Polarity Active high (0x2),

drivers/staging/dgnc/dgnc_driver.h

+0 −3
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ struct board_ops { 
	void (*uart_off)(struct channel_t *ch);

	int  (*drain)(struct tty_struct *tty, uint seconds);

	void (*param)(struct tty_struct *tty);

	void (*vpd)(struct dgnc_board *brd);

	void (*assert_modem_signals)(struct channel_t *ch);

	void (*flush_uart_write)(struct channel_t *ch);

	void (*flush_uart_read)(struct channel_t *ch);
@@ -95,7 +94,6 @@ struct board_ops { 
 * @pdev: Pointer to the pci_dev structure.

 * @device: PCI device ID.

 * @maxports: Maximum ports this board can handle.

 * @vpd: VPD of this board, if found.

 * @bd_lock: Used to protect board.

 * @bd_intr_lock: Protect poller tasklet and interrupt routine from each other.

 * @state: State of the card.
@@ -122,7 +120,6 @@ struct dgnc_board { 
	struct pci_dev	*pdev;

	u16		device;

	uint		maxports;

	unsigned char	vpd[128];



	/* used to protect the board */

	spinlock_t	bd_lock;