diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-04 13:07:52 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-09-04 13:07:52 -0700 |
| commit | bbcc0c699929d3b01ecf3066a35799defe733dd2 (patch) | |
| tree | 5fd368175f54e652b663ebd33dc78e174a288445 /qlcnic_sysfs.patch | |
| parent | cba9545b635d1566060d5a8f1a9dc78680f4e839 (diff) | |
| download | patches-bbcc0c699929d3b01ecf3066a35799defe733dd2.tar.gz | |
remove a bunch of patches now in Linus's tree
Diffstat (limited to 'qlcnic_sysfs.patch')
| -rw-r--r-- | qlcnic_sysfs.patch | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/qlcnic_sysfs.patch b/qlcnic_sysfs.patch index ca3871ede5552e..1905df3aef1477 100644 --- a/qlcnic_sysfs.patch +++ b/qlcnic_sysfs.patch @@ -1,8 +1,10 @@ -diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c -index 10ed82b3..6cc8f15f 100644 +--- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c | 74 +++++++++++----------- + 1 file changed, 40 insertions(+), 34 deletions(-) + --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_sysfs.c -@@ -33,9 +33,9 @@ int qlcnicvf_config_led(struct qlcnic_adapter *adapter, u32 state, u32 rate) +@@ -33,9 +33,9 @@ int qlcnicvf_config_led(struct qlcnic_ad return -EOPNOTSUPP; } @@ -27,7 +29,7 @@ index 10ed82b3..6cc8f15f 100644 { struct qlcnic_adapter *adapter = dev_get_drvdata(dev); int bridged_mode = 0; -@@ -69,10 +68,11 @@ static ssize_t qlcnic_show_bridged_mode(struct device *dev, +@@ -69,10 +68,11 @@ static ssize_t qlcnic_show_bridged_mode( return sprintf(buf, "%d\n", bridged_mode); } @@ -42,7 +44,7 @@ index 10ed82b3..6cc8f15f 100644 { struct qlcnic_adapter *adapter = dev_get_drvdata(dev); unsigned long new; -@@ -86,12 +86,13 @@ static ssize_t qlcnic_store_diag_mode(struct device *dev, +@@ -86,12 +86,13 @@ static ssize_t qlcnic_store_diag_mode(st return len; } @@ -70,7 +72,7 @@ index 10ed82b3..6cc8f15f 100644 { struct qlcnic_adapter *adapter = dev_get_drvdata(dev); int err = 0; -@@ -244,8 +244,8 @@ static ssize_t qlcnic_store_beacon(struct device *dev, +@@ -244,8 +244,8 @@ static ssize_t qlcnic_store_beacon(struc return err; } @@ -81,7 +83,7 @@ index 10ed82b3..6cc8f15f 100644 { struct qlcnic_adapter *adapter = dev_get_drvdata(dev); -@@ -273,6 +273,7 @@ static int qlcnic_sysfs_validate_crb(struct qlcnic_adapter *adapter, +@@ -273,6 +273,7 @@ static int qlcnic_sysfs_validate_crb(str return 0; } @@ -89,7 +91,7 @@ index 10ed82b3..6cc8f15f 100644 static ssize_t qlcnic_sysfs_read_crb(struct file *filp, struct kobject *kobj, struct bin_attribute *attr, char *buf, -@@ -1155,24 +1156,6 @@ static ssize_t qlcnic_83xx_sysfs_flash_write_handler(struct file *filp, +@@ -1155,24 +1156,6 @@ static ssize_t qlcnic_83xx_sysfs_flash_w return size; } @@ -114,7 +116,7 @@ index 10ed82b3..6cc8f15f 100644 static struct bin_attribute bin_attr_crb = { .attr = {.name = "crb", .mode = (S_IRUGO | S_IWUSR)}, .size = 0, -@@ -1236,6 +1219,24 @@ static struct bin_attribute bin_attr_flash = { +@@ -1236,6 +1219,24 @@ static struct bin_attribute bin_attr_fla .write = qlcnic_83xx_sysfs_flash_write_handler, }; @@ -139,7 +141,7 @@ index 10ed82b3..6cc8f15f 100644 void qlcnic_create_sysfs_entries(struct qlcnic_adapter *adapter) { struct device *dev = &adapter->pdev->dev; -@@ -1257,6 +1258,11 @@ void qlcnic_remove_sysfs_entries(struct qlcnic_adapter *adapter) +@@ -1257,6 +1258,11 @@ void qlcnic_remove_sysfs_entries(struct void qlcnic_create_diag_entries(struct qlcnic_adapter *adapter) { struct device *dev = &adapter->pdev->dev; |