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

Commit 31578140 authored by Kumar Gala's avatar Kumar Gala Committed by Jeff Garzik
Browse files

fs-enet: remove code associated with !CONFIG_PPC_MERGE 



Now that arch/ppc is gone we don't need CONFIG_PPC_MERGE anymore remove
the dead code associated with !CONFIG_PPC_MERGE.

With this change the pre_request_irq() and post_free_irq() calls became
nops so they have been removed.  Also removed fs_request_irq() and
fs_free_irq() and just called request_irq() and free_irq().

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Jeff Garzik <jeff@garzik.org>
Cc: Scott Wood <scottwood@freescale.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jgarzik@redhat.com>
parent 83dad4c3

drivers/net/fs_enet/fs_enet-main.c

+3 −19
Original line number Original line Diff line number Diff line
@@ -664,23 +664,6 @@ static int fs_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) 
	return NETDEV_TX_OK;

	return NETDEV_TX_OK;

}

}





static int fs_request_irq(struct net_device *dev, int irq, const char *name,

		irq_handler_t irqf)

{

	struct fs_enet_private *fep = netdev_priv(dev);



	(*fep->ops->pre_request_irq)(dev, irq);

	return request_irq(irq, irqf, IRQF_SHARED, name, dev);

}



static void fs_free_irq(struct net_device *dev, int irq)

{

	struct fs_enet_private *fep = netdev_priv(dev);



	free_irq(irq, dev);

	(*fep->ops->post_free_irq)(dev, irq);

}



static void fs_timeout(struct net_device *dev)

static void fs_timeout(struct net_device *dev)

{

{

	struct fs_enet_private *fep = netdev_priv(dev);

	struct fs_enet_private *fep = netdev_priv(dev);
@@ -800,7 +783,8 @@ static int fs_enet_open(struct net_device *dev) 
		napi_enable(&fep->napi);

		napi_enable(&fep->napi);





	/* Install our interrupt handler. */

	/* Install our interrupt handler. */

	r = fs_request_irq(dev, fep->interrupt, "fs_enet-mac", fs_enet_interrupt);

	r = request_irq(fep->interrupt, fs_enet_interrupt, IRQF_SHARED,

			"fs_enet-mac", dev);

	if (r != 0) {

	if (r != 0) {

		printk(KERN_ERR DRV_MODULE_NAME

		printk(KERN_ERR DRV_MODULE_NAME

		       ": %s Could not allocate FS_ENET IRQ!", dev->name);

		       ": %s Could not allocate FS_ENET IRQ!", dev->name);
@@ -842,7 +826,7 @@ static int fs_enet_close(struct net_device *dev) 
	/* release any irqs */

	/* release any irqs */

	phy_disconnect(fep->phydev);

	phy_disconnect(fep->phydev);

	fep->phydev = NULL;

	fep->phydev = NULL;

	fs_free_irq(dev, fep->interrupt);

	free_irq(fep->interrupt, dev);





	return 0;

	return 0;

}

}

drivers/net/fs_enet/fs_enet.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -34,8 +34,6 @@ struct fs_ops { 
	void (*adjust_link)(struct net_device *dev);

	void (*adjust_link)(struct net_device *dev);

	void (*restart)(struct net_device *dev);

	void (*restart)(struct net_device *dev);

	void (*stop)(struct net_device *dev);

	void (*stop)(struct net_device *dev);

	void (*pre_request_irq)(struct net_device *dev, int irq);

	void (*post_free_irq)(struct net_device *dev, int irq);

	void (*napi_clear_rx_event)(struct net_device *dev);

	void (*napi_clear_rx_event)(struct net_device *dev);

	void (*napi_enable_rx)(struct net_device *dev);

	void (*napi_enable_rx)(struct net_device *dev);

	void (*napi_disable_rx)(struct net_device *dev);

	void (*napi_disable_rx)(struct net_device *dev);

drivers/net/fs_enet/mac-fcc.c

+0 −12
Original line number Original line Diff line number Diff line
@@ -421,16 +421,6 @@ static void stop(struct net_device *dev) 
	fs_cleanup_bds(dev);

	fs_cleanup_bds(dev);

}

}





static void pre_request_irq(struct net_device *dev, int irq)

{

	/* nothing */

}



static void post_free_irq(struct net_device *dev, int irq)

{

	/* nothing */

}



static void napi_clear_rx_event(struct net_device *dev)

static void napi_clear_rx_event(struct net_device *dev)

{

{

	struct fs_enet_private *fep = netdev_priv(dev);

	struct fs_enet_private *fep = netdev_priv(dev);
@@ -540,8 +530,6 @@ const struct fs_ops fs_fcc_ops = { 
	.set_multicast_list	= set_multicast_list,

	.set_multicast_list	= set_multicast_list,

	.restart		= restart,

	.restart		= restart,

	.stop			= stop,

	.stop			= stop,

	.pre_request_irq	= pre_request_irq,

	.post_free_irq		= post_free_irq,

	.napi_clear_rx_event	= napi_clear_rx_event,

	.napi_clear_rx_event	= napi_clear_rx_event,

	.napi_enable_rx		= napi_enable_rx,

	.napi_enable_rx		= napi_enable_rx,

	.napi_disable_rx	= napi_disable_rx,

	.napi_disable_rx	= napi_disable_rx,

drivers/net/fs_enet/mac-fec.c

+0 −30
Original line number Original line Diff line number Diff line
@@ -313,11 +313,7 @@ static void restart(struct net_device *dev) 
	 * Clear any outstanding interrupt.

	 * Clear any outstanding interrupt.

	 */

	 */

	FW(fecp, ievent, 0xffc0);

	FW(fecp, ievent, 0xffc0);

#ifndef CONFIG_PPC_MERGE

	FW(fecp, ivec, (fep->interrupt / 2) << 29);

#else

	FW(fecp, ivec, (virq_to_hw(fep->interrupt) / 2) << 29);

	FW(fecp, ivec, (virq_to_hw(fep->interrupt) / 2) << 29);

#endif





	/*

	/*

	 * adjust to speed (only for DUET & RMII)

	 * adjust to speed (only for DUET & RMII)
@@ -413,30 +409,6 @@ static void stop(struct net_device *dev) 
	}

	}

}

}





static void pre_request_irq(struct net_device *dev, int irq)

{

#ifndef CONFIG_PPC_MERGE

	immap_t *immap = fs_enet_immap;

	u32 siel;



	/* SIU interrupt */

	if (irq >= SIU_IRQ0 && irq < SIU_LEVEL7) {



		siel = in_be32(&immap->im_siu_conf.sc_siel);

		if ((irq & 1) == 0)

			siel |= (0x80000000 >> irq);

		else

			siel &= ~(0x80000000 >> (irq & ~1));

		out_be32(&immap->im_siu_conf.sc_siel, siel);

	}

#endif

}



static void post_free_irq(struct net_device *dev, int irq)

{

	/* nothing */

}



static void napi_clear_rx_event(struct net_device *dev)

static void napi_clear_rx_event(struct net_device *dev)

{

{

	struct fs_enet_private *fep = netdev_priv(dev);

	struct fs_enet_private *fep = netdev_priv(dev);
@@ -529,8 +501,6 @@ const struct fs_ops fs_fec_ops = { 
	.set_multicast_list	= set_multicast_list,

	.set_multicast_list	= set_multicast_list,

	.restart		= restart,

	.restart		= restart,

	.stop			= stop,

	.stop			= stop,

	.pre_request_irq	= pre_request_irq,

	.post_free_irq		= post_free_irq,

	.napi_clear_rx_event	= napi_clear_rx_event,

	.napi_clear_rx_event	= napi_clear_rx_event,

	.napi_enable_rx		= napi_enable_rx,

	.napi_enable_rx		= napi_enable_rx,

	.napi_disable_rx	= napi_disable_rx,

	.napi_disable_rx	= napi_disable_rx,

drivers/net/fs_enet/mac-scc.c

+0 −26
Original line number Original line Diff line number Diff line
@@ -377,30 +377,6 @@ static void stop(struct net_device *dev) 
	fs_cleanup_bds(dev);

	fs_cleanup_bds(dev);

}

}





static void pre_request_irq(struct net_device *dev, int irq)

{

#ifndef CONFIG_PPC_MERGE

	immap_t *immap = fs_enet_immap;

	u32 siel;



	/* SIU interrupt */

	if (irq >= SIU_IRQ0 && irq < SIU_LEVEL7) {



		siel = in_be32(&immap->im_siu_conf.sc_siel);

		if ((irq & 1) == 0)

			siel |= (0x80000000 >> irq);

		else

			siel &= ~(0x80000000 >> (irq & ~1));

		out_be32(&immap->im_siu_conf.sc_siel, siel);

	}

#endif

}



static void post_free_irq(struct net_device *dev, int irq)

{

	/* nothing */

}



static void napi_clear_rx_event(struct net_device *dev)

static void napi_clear_rx_event(struct net_device *dev)

{

{

	struct fs_enet_private *fep = netdev_priv(dev);

	struct fs_enet_private *fep = netdev_priv(dev);
@@ -494,8 +470,6 @@ const struct fs_ops fs_scc_ops = { 
	.set_multicast_list	= set_multicast_list,

	.set_multicast_list	= set_multicast_list,

	.restart		= restart,

	.restart		= restart,

	.stop			= stop,

	.stop			= stop,

	.pre_request_irq	= pre_request_irq,

	.post_free_irq		= post_free_irq,

	.napi_clear_rx_event	= napi_clear_rx_event,

	.napi_clear_rx_event	= napi_clear_rx_event,

	.napi_enable_rx		= napi_enable_rx,

	.napi_enable_rx		= napi_enable_rx,

	.napi_disable_rx	= napi_disable_rx,

	.napi_disable_rx	= napi_disable_rx,