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

Commit 5b296bc9 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

sky2: use debugfs rename 



Use debugfs rename to handle device neame changes.

Signed-off-by: default avatarStephen Hemminger <shemminger@linux-foundation.org>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 3f61e427

drivers/net/sky2.c

+24 −32
Original line number Diff line number Diff line
@@ -3841,16 +3841,19 @@ static int sky2_device_event(struct notifier_block *unused, 
			     unsigned long event, void *ptr)

{

	struct net_device *dev = ptr;



	if (dev->open == sky2_up) {

	struct sky2_port *sky2 = netdev_priv(dev);



	if (dev->open != sky2_up || !sky2_debug)

		return NOTIFY_DONE;



	switch(event) {

	case NETDEV_CHANGENAME:

			if (!netif_running(dev))

		if (sky2->debugfs) {

			sky2->debugfs = debugfs_rename(sky2_debug, sky2->debugfs,

						       sky2_debug, dev->name);

		}

		break;

			/* fallthrough */

		case NETDEV_DOWN:



	case NETDEV_GOING_DOWN:

		if (sky2->debugfs) {

			printk(KERN_DEBUG PFX "%s: remove debugfs\n",
@@ -3858,25 +3861,14 @@ static int sky2_device_event(struct notifier_block *unused, 
			debugfs_remove(sky2->debugfs);

			sky2->debugfs = NULL;

		}



			if (event != NETDEV_CHANGENAME)

		break;

			/* fallthrough for changename */



	case NETDEV_UP:

			if (sky2_debug) {

				struct dentry *d;

				d = debugfs_create_file(dev->name, S_IRUGO,

		sky2->debugfs = debugfs_create_file(dev->name, S_IRUGO,

						    sky2_debug, dev,

						    &sky2_debug_fops);

				if (d == NULL || IS_ERR(d))

					printk(KERN_INFO PFX

					       "%s: debugfs create failed\n",

					       dev->name);

				else

					sky2->debugfs = d;

			}

			break;

		}

		if (IS_ERR(sky2->debugfs))

			sky2->debugfs = NULL;

	}



	return NOTIFY_DONE;