lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

misc: mic: host driver sysfs cleanups.

Browse Source 
+ Use DEVICE_ATTR_RO/RW instead of DEVICE_ATTR
+ Use ATTRIBUTE_GROUPS

These changes were suggested by Greg Kroah-Hartman during the
code review @ https://lkml.org/lkml/2013/9/6/13

Reported-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ashutosh Dixit <ashutosh.dixit@intel.com>
Signed-off-by: Dasaratharaman Chandramouli <dasaratharaman.chandramouli@intel.com>
Signed-off-by: Nikhil Rao <nikhil.rao@intel.com>
Signed-off-by: Harshavardhan R Kharche <harshavardhan.r.kharche@intel.com>
Signed-off-by: Sudeep Dutt <sudeep.dutt@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Sudeep Dutt
2013-09-27 09:49:31 -07:00
committed by Greg Kroah-Hartman
parent 2424a7339b
commit 2ce585286d
1 changed files with 29 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
drivers/misc/mic/host/mic_sysfs.c
View File

@@ -65,7 +65,7 @@ void mic_set_state(struct mic_device *mdev, u8 state)
} }
static ssize_t static ssize_t
mic_show_family(struct device *dev, struct device_attribute *attr, char *buf) family_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
static const char x100[] = "x100"; static const char x100[] = "x100";
static const char unknown[] = "Unknown"; static const char unknown[] = "Unknown";
@@ -85,10 +85,10 @@ mic_show_family(struct device *dev, struct device_attribute *attr, char *buf)
} }
return scnprintf(buf, PAGE_SIZE, "%s\n", card); return scnprintf(buf, PAGE_SIZE, "%s\n", card);
} }
static DEVICE_ATTR(family, S_IRUGO, mic_show_family, NULL); static DEVICE_ATTR_RO(family);
static ssize_t static ssize_t
mic_show_stepping(struct device *dev, struct device_attribute *attr, char *buf) stepping_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct mic_device *mdev = dev_get_drvdata(dev->parent); struct mic_device *mdev = dev_get_drvdata(dev->parent);
char *string = "??"; char *string = "??";
@@ -114,10 +114,10 @@ mic_show_stepping(struct device *dev, struct device_attribute *attr, char *buf)
} }
return scnprintf(buf, PAGE_SIZE, "%s\n", string); return scnprintf(buf, PAGE_SIZE, "%s\n", string);
} }
static DEVICE_ATTR(stepping, S_IRUGO, mic_show_stepping, NULL); static DEVICE_ATTR_RO(stepping);
static ssize_t static ssize_t
mic_show_state(struct device *dev, struct device_attribute *attr, char *buf) state_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct mic_device *mdev = dev_get_drvdata(dev->parent); struct mic_device *mdev = dev_get_drvdata(dev->parent);
@@ -129,7 +129,7 @@ mic_show_state(struct device *dev, struct device_attribute *attr, char *buf)
} }
static ssize_t static ssize_t
mic_store_state(struct device *dev, struct device_attribute *attr, state_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
int rc = 0; int rc = 0;
@@ -160,9 +160,9 @@ mic_store_state(struct device *dev, struct device_attribute *attr,
done: done:
return count; return count;
} }
static DEVICE_ATTR(state, S_IRUGO|S_IWUSR, mic_show_state, mic_store_state); static DEVICE_ATTR_RW(state);
static ssize_t mic_show_shutdown_status(struct device *dev, static ssize_t shutdown_status_show(struct device *dev,
struct device_attribute *attr, char *buf) struct device_attribute *attr, char *buf)
{ {
struct mic_device *mdev = dev_get_drvdata(dev->parent); struct mic_device *mdev = dev_get_drvdata(dev->parent);
@@ -173,11 +173,10 @@ static ssize_t mic_show_shutdown_status(struct device *dev,
return scnprintf(buf, PAGE_SIZE, "%s\n", return scnprintf(buf, PAGE_SIZE, "%s\n",
mic_shutdown_status_string[mdev->shutdown_status]); mic_shutdown_status_string[mdev->shutdown_status]);
} }
static DEVICE_ATTR(shutdown_status, S_IRUGO|S_IWUSR, static DEVICE_ATTR_RO(shutdown_status);
mic_show_shutdown_status, NULL);
static ssize_t static ssize_t
mic_show_cmdline(struct device *dev, struct device_attribute *attr, char *buf) cmdline_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct mic_device *mdev = dev_get_drvdata(dev->parent); struct mic_device *mdev = dev_get_drvdata(dev->parent);
char *cmdline; char *cmdline;
@@ -193,7 +192,7 @@ mic_show_cmdline(struct device *dev, struct device_attribute *attr, char *buf)
} }
static ssize_t static ssize_t
mic_store_cmdline(struct device *dev, struct device_attribute *attr, cmdline_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct mic_device *mdev = dev_get_drvdata(dev->parent); struct mic_device *mdev = dev_get_drvdata(dev->parent);
@@ -220,11 +219,10 @@ unlock:
mutex_unlock(&mdev->mic_mutex); mutex_unlock(&mdev->mic_mutex);
return count; return count;
} }
static DEVICE_ATTR(cmdline, S_IRUGO | S_IWUSR, static DEVICE_ATTR_RW(cmdline);
mic_show_cmdline, mic_store_cmdline);
static ssize_t static ssize_t
mic_show_firmware(struct device *dev, struct device_attribute *attr, char *buf) firmware_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct mic_device *mdev = dev_get_drvdata(dev->parent); struct mic_device *mdev = dev_get_drvdata(dev->parent);
char *firmware; char *firmware;
@@ -240,7 +238,7 @@ mic_show_firmware(struct device *dev, struct device_attribute *attr, char *buf)
} }
static ssize_t static ssize_t
mic_store_firmware(struct device *dev, struct device_attribute *attr, firmware_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct mic_device *mdev = dev_get_drvdata(dev->parent); struct mic_device *mdev = dev_get_drvdata(dev->parent);
@@ -266,11 +264,10 @@ unlock:
mutex_unlock(&mdev->mic_mutex); mutex_unlock(&mdev->mic_mutex);
return count; return count;
} }
static DEVICE_ATTR(firmware, S_IRUGO | S_IWUSR, static DEVICE_ATTR_RW(firmware);
mic_show_firmware, mic_store_firmware);
static ssize_t static ssize_t
mic_show_ramdisk(struct device *dev, struct device_attribute *attr, char *buf) ramdisk_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct mic_device *mdev = dev_get_drvdata(dev->parent); struct mic_device *mdev = dev_get_drvdata(dev->parent);
char *ramdisk; char *ramdisk;
@@ -286,7 +283,7 @@ mic_show_ramdisk(struct device *dev, struct device_attribute *attr, char *buf)
} }
static ssize_t static ssize_t
mic_store_ramdisk(struct device *dev, struct device_attribute *attr, ramdisk_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct mic_device *mdev = dev_get_drvdata(dev->parent); struct mic_device *mdev = dev_get_drvdata(dev->parent);
@@ -313,11 +310,10 @@ unlock:
mutex_unlock(&mdev->mic_mutex); mutex_unlock(&mdev->mic_mutex);
return count; return count;
} }
static DEVICE_ATTR(ramdisk, S_IRUGO | S_IWUSR, static DEVICE_ATTR_RW(ramdisk);
mic_show_ramdisk, mic_store_ramdisk);
static ssize_t static ssize_t
mic_show_bootmode(struct device *dev, struct device_attribute *attr, char *buf) bootmode_show(struct device *dev, struct device_attribute *attr, char *buf)
{ {
struct mic_device *mdev = dev_get_drvdata(dev->parent); struct mic_device *mdev = dev_get_drvdata(dev->parent);
char *bootmode; char *bootmode;
@@ -333,7 +329,7 @@ mic_show_bootmode(struct device *dev, struct device_attribute *attr, char *buf)
} }
static ssize_t static ssize_t
mic_store_bootmode(struct device *dev, struct device_attribute *attr, bootmode_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct mic_device *mdev = dev_get_drvdata(dev->parent); struct mic_device *mdev = dev_get_drvdata(dev->parent);
@@ -363,11 +359,10 @@ unlock:
mutex_unlock(&mdev->mic_mutex); mutex_unlock(&mdev->mic_mutex);
return count; return count;
} }
static DEVICE_ATTR(bootmode, S_IRUGO | S_IWUSR, static DEVICE_ATTR_RW(bootmode);
mic_show_bootmode, mic_store_bootmode);
static ssize_t static ssize_t
mic_show_log_buf_addr(struct device *dev, struct device_attribute *attr, log_buf_addr_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct mic_device *mdev = dev_get_drvdata(dev->parent); struct mic_device *mdev = dev_get_drvdata(dev->parent);
@@ -379,7 +374,7 @@ mic_show_log_buf_addr(struct device *dev, struct device_attribute *attr,
} }
static ssize_t static ssize_t
mic_store_log_buf_addr(struct device *dev, struct device_attribute *attr, log_buf_addr_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct mic_device *mdev = dev_get_drvdata(dev->parent); struct mic_device *mdev = dev_get_drvdata(dev->parent);
@@ -398,11 +393,10 @@ mic_store_log_buf_addr(struct device *dev, struct device_attribute *attr,
exit: exit:
return ret; return ret;
} }
static DEVICE_ATTR(log_buf_addr, S_IRUGO | S_IWUSR, static DEVICE_ATTR_RW(log_buf_addr);
mic_show_log_buf_addr, mic_store_log_buf_addr);
static ssize_t static ssize_t
mic_show_log_buf_len(struct device *dev, struct device_attribute *attr, log_buf_len_show(struct device *dev, struct device_attribute *attr,
char *buf) char *buf)
{ {
struct mic_device *mdev = dev_get_drvdata(dev->parent); struct mic_device *mdev = dev_get_drvdata(dev->parent);
@@ -414,7 +408,7 @@ mic_show_log_buf_len(struct device *dev, struct device_attribute *attr,
} }
static ssize_t static ssize_t
mic_store_log_buf_len(struct device *dev, struct device_attribute *attr, log_buf_len_store(struct device *dev, struct device_attribute *attr,
const char *buf, size_t count) const char *buf, size_t count)
{ {
struct mic_device *mdev = dev_get_drvdata(dev->parent); struct mic_device *mdev = dev_get_drvdata(dev->parent);
@@ -433,8 +427,7 @@ mic_store_log_buf_len(struct device *dev, struct device_attribute *attr,
exit: exit:
return ret; return ret;
} }
static DEVICE_ATTR(log_buf_len, S_IRUGO | S_IWUSR, static DEVICE_ATTR_RW(log_buf_len);
mic_show_log_buf_len, mic_store_log_buf_len);
static struct attribute *mic_default_attrs[] = { static struct attribute *mic_default_attrs[] = {
&dev_attr_family.attr, &dev_attr_family.attr,
@@ -451,16 +444,9 @@ static struct attribute *mic_default_attrs[] = {
NULL NULL
}; };
static struct attribute_group mic_attr_group = { ATTRIBUTE_GROUPS(mic_default);
.attrs = mic_default_attrs,
};
static const struct attribute_group *__mic_attr_group[] = {
&mic_attr_group,
NULL
};
void mic_sysfs_init(struct mic_device *mdev) void mic_sysfs_init(struct mic_device *mdev)
{ {
mdev->attr_group = __mic_attr_group; mdev->attr_group = mic_default_groups;
} }