AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

cxgb3: sysfs attributes in -mm tree

Browse Source 
This patch fixes the usage of sysfs attributes in cxgb3 for the -mm tree.
It is built against the driver commited in the -mm tree.

Signed-off-by: Divy Le Ray <divy@chelsio.com>
Cc: Greg KH <greg@kroah.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
This commit is contained in:
Divy Le Ray 2007-02-08 16:55:59 -08:00 committed by Jeff Garzik
parent f3cc28c797
commit 0ee8d33c64
1 changed files with 45 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
drivers/net/cxgb3/cxgb3_main.c
View File

@ -74,8 +74,6 @@ enum {
#define EEPROM_MAGIC 0x38E2F10C #define EEPROM_MAGIC 0x38E2F10C
#define to_net_dev(class) container_of(class, struct net_device, class_dev)
#define CH_DEVICE(devid, ssid, idx) \ #define CH_DEVICE(devid, ssid, idx) \
{ PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, ssid, 0, 0, idx } { PCI_VENDOR_ID_CHELSIO, devid, PCI_ANY_ID, ssid, 0, 0, idx }
@ -434,11 +432,12 @@ static int setup_sge_qsets(struct adapter *adap)
return 0; return 0;
} }
static ssize_t attr_show(struct class_device *cd, char *buf, static ssize_t attr_show(struct device *d, struct device_attribute *attr,
char *buf,
ssize_t(*format) (struct adapter *, char *)) ssize_t(*format) (struct adapter *, char *))
{ {
ssize_t len; ssize_t len;
struct adapter *adap = to_net_dev(cd)->priv; struct adapter *adap = to_net_dev(d)->priv;
/* Synchronize with ioctls that may shut down the device */ /* Synchronize with ioctls that may shut down the device */
rtnl_lock(); rtnl_lock();
@ -447,14 +446,15 @@ static ssize_t attr_show(struct class_device *cd, char *buf,
return len; return len;
} }
static ssize_t attr_store(struct class_device *cd, const char *buf, size_t len, static ssize_t attr_store(struct device *d, struct device_attribute *attr,
const char *buf, size_t len,
ssize_t(*set) (struct adapter *, unsigned int), ssize_t(*set) (struct adapter *, unsigned int),
unsigned int min_val, unsigned int max_val) unsigned int min_val, unsigned int max_val)
{ {
char *endp; char *endp;
ssize_t ret; ssize_t ret;
unsigned int val; unsigned int val;
struct adapter *adap = to_net_dev(cd)->priv; struct adapter *adap = to_net_dev(d)->priv;
if (!capable(CAP_NET_ADMIN)) if (!capable(CAP_NET_ADMIN))
return -EPERM; return -EPERM;
@ -476,9 +476,10 @@ static ssize_t format_##name(struct adapter *adap, char *buf) \
{ \ { \
return sprintf(buf, "%u\n", val_expr); \ return sprintf(buf, "%u\n", val_expr); \
} \ } \
static ssize_t show_##name(struct class_device *cd, char *buf) \ static ssize_t show_##name(struct device *d, struct device_attribute *attr, \
char *buf) \
{ \ { \
return attr_show(cd, buf, format_##name); \ return attr_show(d, attr, buf, format_##name); \
} }
static ssize_t set_nfilters(struct adapter *adap, unsigned int val) static ssize_t set_nfilters(struct adapter *adap, unsigned int val)
@ -493,10 +494,10 @@ static ssize_t set_nfilters(struct adapter *adap, unsigned int val)
return 0; return 0;
} }
static ssize_t store_nfilters(struct class_device *cd, const char *buf, static ssize_t store_nfilters(struct device *d, struct device_attribute *attr,
size_t len) const char *buf, size_t len)
{ {
return attr_store(cd, buf, len, set_nfilters, 0, ~0); return attr_store(d, attr, buf, len, set_nfilters, 0, ~0);
} }
static ssize_t set_nservers(struct adapter *adap, unsigned int val) static ssize_t set_nservers(struct adapter *adap, unsigned int val)
@ -509,38 +510,39 @@ static ssize_t set_nservers(struct adapter *adap, unsigned int val)
return 0; return 0;
} }
static ssize_t store_nservers(struct class_device *cd, const char *buf, static ssize_t store_nservers(struct device *d, struct device_attribute *attr,
size_t len) const char *buf, size_t len)
{ {
return attr_store(cd, buf, len, set_nservers, 0, ~0); return attr_store(d, attr, buf, len, set_nservers, 0, ~0);
} }
#define CXGB3_ATTR_R(name, val_expr) \ #define CXGB3_ATTR_R(name, val_expr) \
CXGB3_SHOW(name, val_expr) \ CXGB3_SHOW(name, val_expr) \
static CLASS_DEVICE_ATTR(name, S_IRUGO, show_##name, NULL) static DEVICE_ATTR(name, S_IRUGO, show_##name, NULL)
#define CXGB3_ATTR_RW(name, val_expr, store_method) \ #define CXGB3_ATTR_RW(name, val_expr, store_method) \
CXGB3_SHOW(name, val_expr) \ CXGB3_SHOW(name, val_expr) \
static CLASS_DEVICE_ATTR(name, S_IRUGO | S_IWUSR, show_##name, store_method) static DEVICE_ATTR(name, S_IRUGO | S_IWUSR, show_##name, store_method)
CXGB3_ATTR_R(cam_size, t3_mc5_size(&adap->mc5)); CXGB3_ATTR_R(cam_size, t3_mc5_size(&adap->mc5));
CXGB3_ATTR_RW(nfilters, adap->params.mc5.nfilters, store_nfilters); CXGB3_ATTR_RW(nfilters, adap->params.mc5.nfilters, store_nfilters);
CXGB3_ATTR_RW(nservers, adap->params.mc5.nservers, store_nservers); CXGB3_ATTR_RW(nservers, adap->params.mc5.nservers, store_nservers);
static struct attribute *cxgb3_attrs[] = { static struct attribute *cxgb3_attrs[] = {
&class_device_attr_cam_size.attr, &dev_attr_cam_size.attr,
&class_device_attr_nfilters.attr, &dev_attr_nfilters.attr,
&class_device_attr_nservers.attr, &dev_attr_nservers.attr,
NULL NULL
}; };
static struct attribute_group cxgb3_attr_group = {.attrs = cxgb3_attrs }; static struct attribute_group cxgb3_attr_group = {.attrs = cxgb3_attrs };
static ssize_t tm_attr_show(struct class_device *cd, char *buf, int sched) static ssize_t tm_attr_show(struct device *d, struct device_attribute *attr,
char *buf, int sched)
{ {
ssize_t len; ssize_t len;
unsigned int v, addr, bpt, cpt; unsigned int v, addr, bpt, cpt;
struct adapter *adap = to_net_dev(cd)->priv; struct adapter *adap = to_net_dev(d)->priv;
addr = A_TP_TX_MOD_Q1_Q0_RATE_LIMIT - sched / 2; addr = A_TP_TX_MOD_Q1_Q0_RATE_LIMIT - sched / 2;
rtnl_lock(); rtnl_lock();
@ -560,13 +562,13 @@ static ssize_t tm_attr_show(struct class_device *cd, char *buf, int sched)
return len; return len;
} }
static ssize_t tm_attr_store(struct class_device *cd, const char *buf, static ssize_t tm_attr_store(struct device *d, struct device_attribute *attr,
size_t len, int sched) const char *buf, size_t len, int sched)
{ {
char *endp; char *endp;
ssize_t ret; ssize_t ret;
unsigned int val; unsigned int val;
struct adapter *adap = to_net_dev(cd)->priv; struct adapter *adap = to_net_dev(d)->priv;
if (!capable(CAP_NET_ADMIN)) if (!capable(CAP_NET_ADMIN))
return -EPERM; return -EPERM;
@ -584,15 +586,17 @@ static ssize_t tm_attr_store(struct class_device *cd, const char *buf,
} }
#define TM_ATTR(name, sched) \ #define TM_ATTR(name, sched) \
static ssize_t show_##name(struct class_device *cd, char *buf) \ static ssize_t show_##name(struct device *d, struct device_attribute *attr, \
char *buf) \
{ \ { \
return tm_attr_show(cd, buf, sched); \ return tm_attr_show(d, attr, buf, sched); \
} \ } \
static ssize_t store_##name(struct class_device *cd, const char *buf, size_t len) \ static ssize_t store_##name(struct device *d, struct device_attribute *attr, \
const char *buf, size_t len) \
{ \ { \
return tm_attr_store(cd, buf, len, sched); \ return tm_attr_store(d, attr, buf, len, sched); \
} \ } \
static CLASS_DEVICE_ATTR(name, S_IRUGO | S_IWUSR, show_##name, store_##name) static DEVICE_ATTR(name, S_IRUGO | S_IWUSR, show_##name, store_##name)
TM_ATTR(sched0, 0); TM_ATTR(sched0, 0);
TM_ATTR(sched1, 1); TM_ATTR(sched1, 1);
@ -604,14 +608,14 @@ TM_ATTR(sched6, 6);
TM_ATTR(sched7, 7); TM_ATTR(sched7, 7);
static struct attribute *offload_attrs[] = { static struct attribute *offload_attrs[] = {
&class_device_attr_sched0.attr, &dev_attr_sched0.attr,
&class_device_attr_sched1.attr, &dev_attr_sched1.attr,
&class_device_attr_sched2.attr, &dev_attr_sched2.attr,
&class_device_attr_sched3.attr, &dev_attr_sched3.attr,
&class_device_attr_sched4.attr, &dev_attr_sched4.attr,
&class_device_attr_sched5.attr, &dev_attr_sched5.attr,
&class_device_attr_sched6.attr, &dev_attr_sched6.attr,
&class_device_attr_sched7.attr, &dev_attr_sched7.attr,
NULL NULL
}; };
@ -836,7 +840,7 @@ static int offload_open(struct net_device *dev)
init_smt(adapter); init_smt(adapter);
/* Never mind if the next step fails */ /* Never mind if the next step fails */
sysfs_create_group(&tdev->lldev->class_dev.kobj, &offload_attr_group); sysfs_create_group(&tdev->lldev->dev.kobj, &offload_attr_group);
/* Call back all registered clients */ /* Call back all registered clients */
cxgb3_add_clients(tdev); cxgb3_add_clients(tdev);
@ -861,7 +865,7 @@ static int offload_close(struct t3cdev *tdev)
/* Call back all registered clients */ /* Call back all registered clients */
cxgb3_remove_clients(tdev); cxgb3_remove_clients(tdev);
sysfs_remove_group(&tdev->lldev->class_dev.kobj, &offload_attr_group); sysfs_remove_group(&tdev->lldev->dev.kobj, &offload_attr_group);
tdev->lldev = NULL; tdev->lldev = NULL;
cxgb3_set_dummy_ops(tdev); cxgb3_set_dummy_ops(tdev);
@ -2420,7 +2424,7 @@ static int __devinit init_one(struct pci_dev *pdev,
else if (msi > 0 && pci_enable_msi(pdev) == 0) else if (msi > 0 && pci_enable_msi(pdev) == 0)
adapter->flags |= USING_MSI; adapter->flags |= USING_MSI;
err = sysfs_create_group(&adapter->port[0]->class_dev.kobj, err = sysfs_create_group(&adapter->port[0]->dev.kobj,
&cxgb3_attr_group); &cxgb3_attr_group);
print_port_info(adapter, ai); print_port_info(adapter, ai);
@ -2452,7 +2456,7 @@ static void __devexit remove_one(struct pci_dev *pdev)
struct adapter *adapter = dev->priv; struct adapter *adapter = dev->priv;
t3_sge_stop(adapter); t3_sge_stop(adapter);
sysfs_remove_group(&adapter->port[0]->class_dev.kobj, sysfs_remove_group(&adapter->port[0]->dev.kobj,
&cxgb3_attr_group); &cxgb3_attr_group);
for_each_port(adapter, i) for_each_port(adapter, i)