{
struct edac_device_ctl_info *edac_dev = to_edacdev(kobj);
- debugf1("%s() control index=%d\n", __func__, edac_dev->dev_idx);
+ debugf4("%s() control index=%d\n", __func__, edac_dev->dev_idx);
/* decrement the EDAC CORE module ref count */
module_put(edac_dev->owner);
/* Init the devices's kobject */
memset(&edac_dev->kobj, 0, sizeof(struct kobject));
- edac_dev->kobj.ktype = &ktype_device_ctrl;
-
- /* set this new device under the edac_class kobject */
- edac_dev->kobj.parent = &edac_class->kset.kobj;
-
- /* generate sysfs "..../edac/<name>" */
- debugf1("%s() set name of kobject to: %s\n", __func__, edac_dev->name);
- err = kobject_set_name(&edac_dev->kobj, "%s", edac_dev->name);
- if (err)
- goto err_out;
/* Record which module 'owns' this control structure
* and bump the ref count of the module
}
/* register */
- err = kobject_register(&edac_dev->kobj);
+ err = kobject_init_and_add(&edac_dev->kobj, &ktype_device_ctrl,
+ &edac_class->kset.kobj,
+ "%s", edac_dev->name);
if (err) {
debugf1("%s()Failed to register '.../edac/%s'\n",
__func__, edac_dev->name);
goto err_kobj_reg;
}
+ kobject_uevent(&edac_dev->kobj, KOBJ_ADD);
/* At this point, to 'free' the control struct,
* edac_device_unregister_sysfs_main_kobj() must be used
*/
- debugf1("%s() Registered '.../edac/%s' kobject\n",
+ debugf4("%s() Registered '.../edac/%s' kobject\n",
__func__, edac_dev->name);
return 0;
struct edac_device_ctl_info *edac_dev)
{
debugf0("%s()\n", __func__);
- debugf1("%s() name of kobject is: %s\n",
+ debugf4("%s() name of kobject is: %s\n",
__func__, kobject_name(&edac_dev->kobj));
/*
* a) module_put() this module
* b) 'kfree' the memory
*/
- kobject_unregister(&edac_dev->kobj);
+ kobject_put(&edac_dev->kobj);
}
/* edac_dev -> instance information */
/* edac_dev -> instance -> block information */
+#define to_block(k) container_of(k, struct edac_device_block, kobj)
+#define to_block_attr(a) \
+ container_of(a, struct edac_dev_sysfs_block_attribute, attr)
+
/*
* Set of low-level block attribute show functions
*/
-static ssize_t block_ue_count_show(struct edac_device_block *block, char *data)
+static ssize_t block_ue_count_show(struct kobject *kobj,
+ struct attribute *attr, char *data)
{
+ struct edac_device_block *block = to_block(kobj);
+
return sprintf(data, "%u\n", block->counters.ue_count);
}
-static ssize_t block_ce_count_show(struct edac_device_block *block, char *data)
+static ssize_t block_ce_count_show(struct kobject *kobj,
+ struct attribute *attr, char *data)
{
+ struct edac_device_block *block = to_block(kobj);
+
return sprintf(data, "%u\n", block->counters.ce_count);
}
-#define to_block(k) container_of(k, struct edac_device_block, kobj)
-#define to_block_attr(a) container_of(a,struct block_attribute,attr)
-
/* DEVICE block kobject release() function */
static void edac_device_ctrl_block_release(struct kobject *kobj)
{
kobject_put(&block->instance->ctl->kobj);
}
-/* block specific attribute structure */
-struct block_attribute {
- struct attribute attr;
- ssize_t(*show) (struct edac_device_block *, char *);
- ssize_t(*store) (struct edac_device_block *, const char *, size_t);
-};
/* Function to 'show' fields from the edac_dev 'block' structure */
static ssize_t edac_dev_block_show(struct kobject *kobj,
struct attribute *attr, char *buffer)
{
- struct edac_device_block *block = to_block(kobj);
- struct block_attribute *block_attr = to_block_attr(attr);
+ struct edac_dev_sysfs_block_attribute *block_attr =
+ to_block_attr(attr);
if (block_attr->show)
- return block_attr->show(block, buffer);
+ return block_attr->show(kobj, attr, buffer);
return -EIO;
}
struct attribute *attr,
const char *buffer, size_t count)
{
- struct edac_device_block *block = to_block(kobj);
- struct block_attribute *block_attr = to_block_attr(attr);
+ struct edac_dev_sysfs_block_attribute *block_attr;
+
+ block_attr = to_block_attr(attr);
if (block_attr->store)
- return block_attr->store(block, buffer, count);
+ return block_attr->store(kobj, attr, buffer, count);
return -EIO;
}
};
#define BLOCK_ATTR(_name,_mode,_show,_store) \
-static struct block_attribute attr_block_##_name = { \
+static struct edac_dev_sysfs_block_attribute attr_block_##_name = { \
.attr = {.name = __stringify(_name), .mode = _mode }, \
.show = _show, \
.store = _store, \
BLOCK_ATTR(ue_count, S_IRUGO, block_ue_count_show, NULL);
/* list of edac_dev 'block' attributes */
-static struct block_attribute *device_block_attr[] = {
+static struct edac_dev_sysfs_block_attribute *device_block_attr[] = {
&attr_block_ce_count,
&attr_block_ue_count,
NULL,
struct edac_dev_sysfs_block_attribute *sysfs_attrib;
struct kobject *main_kobj;
- debugf1("%s() Instance '%s' block '%s'\n",
- __func__, instance->name, block->name);
+ debugf4("%s() Instance '%s' inst_p=%p block '%s' block_p=%p\n",
+ __func__, instance->name, instance, block->name, block);
+ debugf4("%s() block kobj=%p block kobj->parent=%p\n",
+ __func__, &block->kobj, &block->kobj.parent);
/* init this block's kobject */
memset(&block->kobj, 0, sizeof(struct kobject));
- block->kobj.parent = &instance->kobj;
- block->kobj.ktype = &ktype_block_ctrl;
- block->instance = instance;
-
- err = kobject_set_name(&block->kobj, "%s", block->name);
- if (err)
- return err;
/* bump the main kobject's reference count for this controller
* and this instance is dependant on the main
}
/* Add this block's kobject */
- err = kobject_register(&block->kobj);
+ err = kobject_init_and_add(&block->kobj, &ktype_block_ctrl,
+ &instance->kobj,
+ "%s", block->name);
if (err) {
debugf1("%s() Failed to register instance '%s'\n",
__func__, block->name);
* to the block kobject
*/
sysfs_attrib = block->block_attributes;
- if (sysfs_attrib) {
- for (i = 0; i < block->nr_attribs; i++) {
+ if (sysfs_attrib && block->nr_attribs) {
+ for (i = 0; i < block->nr_attribs; i++, sysfs_attrib++) {
+
+ debugf4("%s() creating block attrib='%s' "
+ "attrib->%p to kobj=%p\n",
+ __func__,
+ sysfs_attrib->attr.name,
+ sysfs_attrib, &block->kobj);
+
+ /* Create each block_attribute file */
err = sysfs_create_file(&block->kobj,
- (struct attribute *) sysfs_attrib);
+ &sysfs_attrib->attr);
if (err)
goto err_on_attrib;
-
- sysfs_attrib++;
}
}
+ kobject_uevent(&block->kobj, KOBJ_ADD);
return 0;
/* Error unwind stack */
err_on_attrib:
- kobject_unregister(&block->kobj);
+ kobject_put(&block->kobj);
err_out:
return err;
*/
sysfs_attrib = block->block_attributes;
if (sysfs_attrib && block->nr_attribs) {
- for (i = 0; i < block->nr_attribs; i++) {
+ for (i = 0; i < block->nr_attribs; i++, sysfs_attrib++) {
+
+ /* remove each block_attrib file */
sysfs_remove_file(&block->kobj,
(struct attribute *) sysfs_attrib);
}
/* unregister this block's kobject, SEE:
* edac_device_ctrl_block_release() callback operation
*/
- kobject_unregister(&block->kobj);
+ kobject_put(&block->kobj);
}
/* instance ctor/dtor code */
/* Init the instance's kobject */
memset(&instance->kobj, 0, sizeof(struct kobject));
- /* set this new device under the edac_device main kobject */
- instance->kobj.parent = &edac_dev->kobj;
- instance->kobj.ktype = &ktype_instance_ctrl;
instance->ctl = edac_dev;
- err = kobject_set_name(&instance->kobj, "%s", instance->name);
- if (err)
- goto err_out;
-
/* bump the main kobject's reference count for this controller
* and this instance is dependant on the main
*/
goto err_out;
}
- /* Formally register this instance's kobject */
- err = kobject_register(&instance->kobj);
+ /* Formally register this instance's kobject under the edac_device */
+ err = kobject_init_and_add(&instance->kobj, &ktype_instance_ctrl,
+ &edac_dev->kobj, "%s", instance->name);
if (err != 0) {
debugf2("%s() Failed to register instance '%s'\n",
__func__, instance->name);
goto err_out;
}
- debugf1("%s() now register '%d' blocks for instance %d\n",
+ debugf4("%s() now register '%d' blocks for instance %d\n",
__func__, instance->nr_blocks, idx);
/* register all blocks of this instance */
goto err_release_instance_kobj;
}
}
+ kobject_uevent(&instance->kobj, KOBJ_ADD);
- debugf1("%s() Registered instance %d '%s' kobject\n",
+ debugf4("%s() Registered instance %d '%s' kobject\n",
__func__, idx, instance->name);
return 0;
/* error unwind stack */
err_release_instance_kobj:
- kobject_unregister(&instance->kobj);
+ kobject_put(&instance->kobj);
err_out:
return err;
/* unregister this instance's kobject, SEE:
* edac_device_ctrl_instance_release() for callback operation
*/
- kobject_unregister(&instance->kobj);
+ kobject_put(&instance->kobj);
}
/*
}
- debugf0("%s() calling create-instances, idx=%d\n",
+ debugf4("%s() create-instances done, idx=%d\n",
__func__, edac_dev->dev_idx);
return 0;
git://ftp.safe.ca / safe / jmp / linux-2.6 / blobdiff