projects
/
linux-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit...
[linux-block.git]
/
drivers
/
block
/
pktcdvd.c
diff --git
a/drivers/block/pktcdvd.c
b/drivers/block/pktcdvd.c
index b72935b8f2036e3ea954b5560fe88fd3875f5d96..ddf19425245dd4004832cd6c7c4343f8ba8764ec 100644
(file)
--- a/
drivers/block/pktcdvd.c
+++ b/
drivers/block/pktcdvd.c
@@
-57,6
+57,7
@@
#include <linux/miscdevice.h>
#include <linux/freezer.h>
#include <linux/mutex.h>
#include <linux/miscdevice.h>
#include <linux/freezer.h>
#include <linux/mutex.h>
+#include <linux/slab.h>
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_ioctl.h>
#include <scsi/scsi.h>
#include <scsi/scsi_cmnd.h>
#include <scsi/scsi_ioctl.h>
#include <scsi/scsi.h>
@@
-284,7
+285,7
@@
static ssize_t kobj_pkt_store(struct kobject *kobj,
return len;
}
return len;
}
-static struct sysfs_ops kobj_pkt_ops = {
+static
const
struct sysfs_ops kobj_pkt_ops = {
.show = kobj_pkt_show,
.store = kobj_pkt_store
};
.show = kobj_pkt_show,
.store = kobj_pkt_store
};
@@
-337,7
+338,9
@@
static void class_pktcdvd_release(struct class *cls)
{
kfree(cls);
}
{
kfree(cls);
}
-static ssize_t class_pktcdvd_show_map(struct class *c, char *data)
+static ssize_t class_pktcdvd_show_map(struct class *c,
+ struct class_attribute *attr,
+ char *data)
{
int n = 0;
int idx;
{
int n = 0;
int idx;
@@
-356,7
+359,9
@@
static ssize_t class_pktcdvd_show_map(struct class *c, char *data)
return n;
}
return n;
}
-static ssize_t class_pktcdvd_store_add(struct class *c, const char *buf,
+static ssize_t class_pktcdvd_store_add(struct class *c,
+ struct class_attribute *attr,
+ const char *buf,
size_t count)
{
unsigned int major, minor;
size_t count)
{
unsigned int major, minor;
@@
-376,7
+381,9
@@
static ssize_t class_pktcdvd_store_add(struct class *c, const char *buf,
return -EINVAL;
}
return -EINVAL;
}
-static ssize_t class_pktcdvd_store_remove(struct class *c, const char *buf,
+static ssize_t class_pktcdvd_store_remove(struct class *c,
+ struct class_attribute *attr,
+ const char *buf,
size_t count)
{
unsigned int major, minor;
size_t count)
{
unsigned int major, minor;