niu: Naming interrupt vectors. (70340d72) · Commits · 戴 / test

drivers/net/niu.c

+26 −1

Original line number	Diff line number	Diff line
		@@ -5847,17 +5847,42 @@ static void niu_stop_hw(struct niu *np)
		niu_reset_rx_channels(np);
		}

		static void niu_set_irq_name(struct niu *np)
		{
		int port = np->port;
		int i, j = 1;

		sprintf(np->irq_name[0], "%s:MAC", np->dev->name);

		if (port == 0) {
		sprintf(np->irq_name[1], "%s:MIF", np->dev->name);
		sprintf(np->irq_name[2], "%s:SYSERR", np->dev->name);
		j = 3;
		}

		for (i = 0; i < np->num_ldg - j; i++) {
		if (i < np->num_rx_rings)
		sprintf(np->irq_name[i+j], "%s-rx-%d",
		np->dev->name, i);
		else if (i < np->num_tx_rings + np->num_rx_rings)
		sprintf(np->irq_name[i+j], "%s-tx-%d", np->dev->name,
		i - np->num_rx_rings);
		}
		}

		static int niu_request_irq(struct niu *np)
		{
		int i, j, err;

		niu_set_irq_name(np);

		err = 0;
		for (i = 0; i < np->num_ldg; i++) {
		struct niu_ldg *lp = &np->ldg[i];

		err = request_irq(lp->irq, niu_interrupt,
		IRQF_SHARED \| IRQF_SAMPLE_RANDOM,
		np->dev->name, lp);
		np->irq_name[i], lp);
		if (err)
		goto out_free_irqs;

+1 −0

Original line number	Diff line number	Diff line
		@@ -3243,6 +3243,7 @@ struct niu {
		#define NIU_FLAGS_XMAC 0x00010000 /* 0=BMAC 1=XMAC */

		u32 msg_enable;
		char irq_name[NIU_NUM_RXCHAN+NIU_NUM_TXCHAN+3][IFNAMSIZ + 6];

		/* Protects hw programming, and ring state. */
		spinlock_t lock;