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

Commit 20d14a5d authored by Ivan Vecera's avatar Ivan Vecera Committed by David S. Miller
Browse files

tg3: move init/deinit from open/close to probe/remove 



Move init and deinit of PTP support from open/close functions
to probe/remove funcs to avoid removing/re-adding of associated PTP
device(s) during ifup/ifdown.

v2: tg3_ptp_init call moved to correct place (thx. Prashant)

Signed-off-by: default avatarIvan Vecera <ivecera@redhat.com>
Acked-by: default avatarPrashant Sreedharan <prashant@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3ec7a176

drivers/net/ethernet/broadcom/tg3.c

+11 −14
Original line number Diff line number Diff line
@@ -11556,12 +11556,8 @@ static int tg3_start(struct tg3 *tp, bool reset_phy, bool test_irq, 
	tg3_flag_set(tp, INIT_COMPLETE);

	tg3_enable_ints(tp);



	if (init)

		tg3_ptp_init(tp);

	else

	tg3_ptp_resume(tp);





	tg3_full_unlock(tp);



	netif_tx_start_all_queues(dev);
@@ -11681,13 +11677,6 @@ static int tg3_open(struct net_device *dev) 
		pci_set_power_state(tp->pdev, PCI_D3hot);

	}



	if (tg3_flag(tp, PTP_CAPABLE)) {

		tp->ptp_clock = ptp_clock_register(&tp->ptp_info,

						   &tp->pdev->dev);

		if (IS_ERR(tp->ptp_clock))

			tp->ptp_clock = NULL;

	}



	return err;

}
@@ -11701,8 +11690,6 @@ static int tg3_close(struct net_device *dev) 
		return -EAGAIN;

	}



	tg3_ptp_fini(tp);



	tg3_stop(tp);



	/* Clear stats across close / open calls */
@@ -17880,6 +17867,14 @@ static int tg3_init_one(struct pci_dev *pdev, 
		goto err_out_apeunmap;

	}



	if (tg3_flag(tp, PTP_CAPABLE)) {

		tg3_ptp_init(tp);

		tp->ptp_clock = ptp_clock_register(&tp->ptp_info,

						   &tp->pdev->dev);

		if (IS_ERR(tp->ptp_clock))

			tp->ptp_clock = NULL;

	}



	netdev_info(dev, "Tigon3 [partno(%s) rev %04x] (%s) MAC address %pM\n",

		    tp->board_part_number,

		    tg3_chip_rev_id(tp),
@@ -17955,6 +17950,8 @@ static void tg3_remove_one(struct pci_dev *pdev) 
	if (dev) {

		struct tg3 *tp = netdev_priv(dev);



		tg3_ptp_fini(tp);



		release_firmware(tp->fw);



		tg3_reset_task_cancel(tp);