Commit 4409d281 authored by Kumar Gala's avatar Kumar Gala
Browse files

Convert network devices to use struct device instead of class_device 



Convert network devices to use struct device instead of class_device.  Greg
missed this one in his cleanup path.

Signed-off-by: default avatarKumar Gala <galak@kernel.crashing.org>
parent ec2f9d13

drivers/net/gianfar_sysfs.c

+55 −53
Original line number Diff line number Diff line
@@ -39,13 +39,15 @@ 
#include "gianfar.h"



#define GFAR_ATTR(_name) \

static ssize_t gfar_show_##_name(struct class_device *cdev, char *buf); \

static ssize_t gfar_set_##_name(struct class_device *cdev, \

static ssize_t gfar_show_##_name(struct device *dev, \

	 struct device_attribute *attr, char *buf); \

static ssize_t gfar_set_##_name(struct device *dev, \

		struct device_attribute *attr, \

		const char *buf, size_t count); \

static CLASS_DEVICE_ATTR(_name, 0644, gfar_show_##_name, gfar_set_##_name)

static DEVICE_ATTR(_name, 0644, gfar_show_##_name, gfar_set_##_name)



#define GFAR_CREATE_FILE(_dev, _name) \

	class_device_create_file(&_dev->class_dev, &class_device_attr_##_name)

	device_create_file(&_dev->dev, &dev_attr_##_name)



GFAR_ATTR(bd_stash);

GFAR_ATTR(rx_stash_size);
@@ -54,21 +56,19 @@ GFAR_ATTR(fifo_threshold); 
GFAR_ATTR(fifo_starve);

GFAR_ATTR(fifo_starve_off);



#define to_net_dev(cd) container_of(cd, struct net_device, class_dev)



static ssize_t gfar_show_bd_stash(struct class_device *cdev, char *buf)

static ssize_t gfar_show_bd_stash(struct device *dev,

				  struct device_attribute *attr, char *buf)

{

	struct net_device *dev = to_net_dev(cdev);

	struct gfar_private *priv = netdev_priv(dev);

	struct gfar_private *priv = netdev_priv(to_net_dev(dev));



	return sprintf(buf, "%s\n", priv->bd_stash_en ? "on" : "off");

}



static ssize_t gfar_set_bd_stash(struct class_device *cdev,

static ssize_t gfar_set_bd_stash(struct device *dev,

				 struct device_attribute *attr,

				 const char *buf, size_t count)

{

	struct net_device *dev = to_net_dev(cdev);

	struct gfar_private *priv = netdev_priv(dev);

	struct gfar_private *priv = netdev_priv(to_net_dev(dev));

	int new_setting = 0;

	u32 temp;

	unsigned long flags;
@@ -76,7 +76,8 @@ static ssize_t gfar_set_bd_stash(struct class_device *cdev, 
	/* Find out the new setting */

	if (!strncmp("on", buf, count - 1) || !strncmp("1", buf, count - 1))

		new_setting = 1;

	else if (!strncmp("off", buf, count-1) || !strncmp("0", buf, count-1))

	else if (!strncmp("off", buf, count - 1)

		 || !strncmp("0", buf, count - 1))

		new_setting = 0;

	else

		return count;
@@ -100,19 +101,19 @@ static ssize_t gfar_set_bd_stash(struct class_device *cdev, 
	return count;

}



static ssize_t gfar_show_rx_stash_size(struct class_device *cdev, char *buf)

static ssize_t gfar_show_rx_stash_size(struct device *dev,

				       struct device_attribute *attr, char *buf)

{

	struct net_device *dev = to_net_dev(cdev);

	struct gfar_private *priv = netdev_priv(dev);

	struct gfar_private *priv = netdev_priv(to_net_dev(dev));



	return sprintf(buf, "%d\n", priv->rx_stash_size);

}



static ssize_t gfar_set_rx_stash_size(struct class_device *cdev,

static ssize_t gfar_set_rx_stash_size(struct device *dev,

				      struct device_attribute *attr,

				      const char *buf, size_t count)

{

	struct net_device *dev = to_net_dev(cdev);

	struct gfar_private *priv = netdev_priv(dev);

	struct gfar_private *priv = netdev_priv(to_net_dev(dev));

	unsigned int length = simple_strtoul(buf, NULL, 0);

	u32 temp;

	unsigned long flags;
@@ -146,21 +147,21 @@ static ssize_t gfar_set_rx_stash_size(struct class_device *cdev, 
	return count;

}





/* Stashing will only be enabled when rx_stash_size != 0 */

static ssize_t gfar_show_rx_stash_index(struct class_device *cdev, char *buf)

static ssize_t gfar_show_rx_stash_index(struct device *dev,

					struct device_attribute *attr,

					char *buf)

{

	struct net_device *dev = to_net_dev(cdev);

	struct gfar_private *priv = netdev_priv(dev);

	struct gfar_private *priv = netdev_priv(to_net_dev(dev));



	return sprintf(buf, "%d\n", priv->rx_stash_index);

}



static ssize_t gfar_set_rx_stash_index(struct class_device *cdev,

static ssize_t gfar_set_rx_stash_index(struct device *dev,

				       struct device_attribute *attr,

				       const char *buf, size_t count)

{

	struct net_device *dev = to_net_dev(cdev);

	struct gfar_private *priv = netdev_priv(dev);

	struct gfar_private *priv = netdev_priv(to_net_dev(dev));

	unsigned short index = simple_strtoul(buf, NULL, 0);

	u32 temp;

	unsigned long flags;
@@ -184,19 +185,20 @@ static ssize_t gfar_set_rx_stash_index(struct class_device *cdev, 
	return count;

}



static ssize_t gfar_show_fifo_threshold(struct class_device *cdev, char *buf)

static ssize_t gfar_show_fifo_threshold(struct device *dev,

					struct device_attribute *attr,

					char *buf)

{

	struct net_device *dev = to_net_dev(cdev);

	struct gfar_private *priv = netdev_priv(dev);

	struct gfar_private *priv = netdev_priv(to_net_dev(dev));



	return sprintf(buf, "%d\n", priv->fifo_threshold);

}



static ssize_t gfar_set_fifo_threshold(struct class_device *cdev,

static ssize_t gfar_set_fifo_threshold(struct device *dev,

				       struct device_attribute *attr,

				       const char *buf, size_t count)

{

	struct net_device *dev = to_net_dev(cdev);

	struct gfar_private *priv = netdev_priv(dev);

	struct gfar_private *priv = netdev_priv(to_net_dev(dev));

	unsigned int length = simple_strtoul(buf, NULL, 0);

	u32 temp;

	unsigned long flags;
@@ -218,20 +220,19 @@ static ssize_t gfar_set_fifo_threshold(struct class_device *cdev, 
	return count;

}



static ssize_t gfar_show_fifo_starve(struct class_device *cdev, char *buf)

static ssize_t gfar_show_fifo_starve(struct device *dev,

				     struct device_attribute *attr, char *buf)

{

	struct net_device *dev = to_net_dev(cdev);

	struct gfar_private *priv = netdev_priv(dev);

	struct gfar_private *priv = netdev_priv(to_net_dev(dev));



	return sprintf(buf, "%d\n", priv->fifo_starve);

}





static ssize_t gfar_set_fifo_starve(struct class_device *cdev,

static ssize_t gfar_set_fifo_starve(struct device *dev,

				    struct device_attribute *attr,

				    const char *buf, size_t count)

{

	struct net_device *dev = to_net_dev(cdev);

	struct gfar_private *priv = netdev_priv(dev);

	struct gfar_private *priv = netdev_priv(to_net_dev(dev));

	unsigned int num = simple_strtoul(buf, NULL, 0);

	u32 temp;

	unsigned long flags;
@@ -253,19 +254,20 @@ static ssize_t gfar_set_fifo_starve(struct class_device *cdev, 
	return count;

}



static ssize_t gfar_show_fifo_starve_off(struct class_device *cdev, char *buf)

static ssize_t gfar_show_fifo_starve_off(struct device *dev,

					 struct device_attribute *attr,

					 char *buf)

{

	struct net_device *dev = to_net_dev(cdev);

	struct gfar_private *priv = netdev_priv(dev);

	struct gfar_private *priv = netdev_priv(to_net_dev(dev));



	return sprintf(buf, "%d\n", priv->fifo_starve_off);

}



static ssize_t gfar_set_fifo_starve_off(struct class_device *cdev,

static ssize_t gfar_set_fifo_starve_off(struct device *dev,

					struct device_attribute *attr,

					const char *buf, size_t count)

{

	struct net_device *dev = to_net_dev(cdev);

	struct gfar_private *priv = netdev_priv(dev);

	struct gfar_private *priv = netdev_priv(to_net_dev(dev));

	unsigned int num = simple_strtoul(buf, NULL, 0);

	u32 temp;

	unsigned long flags;