Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 175050
b: refs/heads/master
c: 2a20bf6
h: refs/heads/master
v: v3
  • Loading branch information
Shawn Bohrer authored and Greg Kroah-Hartman committed Dec 11, 2009
1 parent a113d67 commit 9e08fa2
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: acdc102181212481f94d0483f5a7a7f9f6cbafd3
refs/heads/master: 2a20bf6f1a945994f5c43308b6dd8b7058e2c290
14 changes: 6 additions & 8 deletions trunk/drivers/staging/line6/control.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@
struct device_attribute dev_attr_##_name1 = __ATTR(_name2, _mode, _show, _store)

#define LINE6_PARAM_R(PREFIX, prefix, type, param) \
static ssize_t prefix ## _get_ ## param(struct device *dev, \
static ssize_t prefix##_get_##param(struct device *dev, \
struct device_attribute *attr, char *buf) \
{ \
return prefix ## _get_param_ ## type(dev, buf, PREFIX ## _ ## param); \
return prefix##_get_param_##type(dev, buf, PREFIX##_##param); \
}

#define LINE6_PARAM_RW(PREFIX, prefix, type, param) \
LINE6_PARAM_R(PREFIX, prefix, type, param); \
static ssize_t prefix ## _set_ ## param(struct device *dev, \
static ssize_t prefix##_set_##param(struct device *dev, \
struct device_attribute *attr, const char *buf, size_t count) \
{ \
return prefix ## _set_param_ ## type(dev, buf, count, PREFIX ## _ ## param); \
return prefix##_set_param_##type(dev, buf, count, PREFIX##_##param); \
}

#define POD_PARAM_R(type, param) LINE6_PARAM_R(POD, pod, type, param)
Expand Down Expand Up @@ -727,6 +727,7 @@ int pod_create_files(int firmware, int type, struct device *dev)
(dev, &dev_attr_band_6_gain__bass));
return 0;
}
EXPORT_SYMBOL(pod_create_files);

void pod_remove_files(int firmware, int type, struct device *dev)
{
Expand Down Expand Up @@ -901,8 +902,6 @@ void pod_remove_files(int firmware, int type, struct device *dev)
if (firmware >= 200)
device_remove_file(dev, &dev_attr_band_6_gain__bass);
}

EXPORT_SYMBOL(pod_create_files);
EXPORT_SYMBOL(pod_remove_files);

int variax_create_files(int firmware, int type, struct device *dev)
Expand Down Expand Up @@ -949,6 +948,7 @@ int variax_create_files(int firmware, int type, struct device *dev)
CHECK_RETURN(device_create_file(dev, &dev_attr_pickup_wiring));
return 0;
}
EXPORT_SYMBOL(variax_create_files);

void variax_remove_files(int firmware, int type, struct device *dev)
{
Expand Down Expand Up @@ -992,6 +992,4 @@ void variax_remove_files(int firmware, int type, struct device *dev)
device_remove_file(dev, &dev_attr_mix1);
device_remove_file(dev, &dev_attr_pickup_wiring);
}

EXPORT_SYMBOL(variax_create_files);
EXPORT_SYMBOL(variax_remove_files);

0 comments on commit 9e08fa2

Please sign in to comment.