adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

kobject: convert ibmasm to use kref, not kobject

Browse source 
The IBM asm driver is using a kobject only for reference counting,
nothing else.  So switch it to use a kref instead, which is all that is
needed, and is much smaller.

Cc: Max Asböck <amax@us.ibm.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2007-12-03 21:16:20 -07:00
parent d7b3788965
commit a045171f87
2 changed files with 9 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/misc/ibmasm/command.c
View file

@ -26,11 +26,6 @@
#include "lowlevel.h" #include "lowlevel.h"
static void exec_next_command(struct service_processor *sp); static void exec_next_command(struct service_processor *sp);
static void free_command(struct kobject *kobj);
static struct kobj_type ibmasm_cmd_kobj_type = {
.release = free_command,
};
static atomic_t command_count = ATOMIC_INIT(0); static atomic_t command_count = ATOMIC_INIT(0);
@ -53,8 +48,7 @@ struct command *ibmasm_new_command(struct service_processor *sp, size_t buffer_s
} }
cmd->buffer_size = buffer_size; cmd->buffer_size = buffer_size;
kobject_init(&cmd->kobj); kref_init(&cmd->kref);
cmd->kobj.ktype = &ibmasm_cmd_kobj_type;
cmd->lock = &sp->lock; cmd->lock = &sp->lock;
cmd->status = IBMASM_CMD_PENDING; cmd->status = IBMASM_CMD_PENDING;
@ -67,9 +61,9 @@ struct command *ibmasm_new_command(struct service_processor *sp, size_t buffer_s
return cmd; return cmd;
} }
static void free_command(struct kobject *kobj) void ibmasm_free_command(struct kref *kref)
{ {
struct command *cmd = to_command(kobj); struct command *cmd = to_command(kref);
list_del(&cmd->queue_node); list_del(&cmd->queue_node);
atomic_dec(&command_count); atomic_dec(&command_count);

10
drivers/misc/ibmasm/ibmasm.h
View file

@ -31,6 +31,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/kref.h>
#include <linux/device.h> #include <linux/device.h>
#include <linux/input.h> #include <linux/input.h>
@ -92,24 +93,25 @@ struct command {
unsigned char *buffer; unsigned char *buffer;
size_t buffer_size; size_t buffer_size;
int status; int status;
struct kobject kobj; struct kref kref;
spinlock_t *lock; spinlock_t *lock;
}; };
#define to_command(c) container_of(c, struct command, kobj) #define to_command(c) container_of(c, struct command, kref)
void ibmasm_free_command(struct kref *kref);
static inline void command_put(struct command *cmd) static inline void command_put(struct command *cmd)
{ {
unsigned long flags; unsigned long flags;
spinlock_t *lock = cmd->lock; spinlock_t *lock = cmd->lock;
spin_lock_irqsave(lock, flags); spin_lock_irqsave(lock, flags);
kobject_put(&cmd->kobj); kref_put(&cmd->kref, ibmasm_free_command);
spin_unlock_irqrestore(lock, flags); spin_unlock_irqrestore(lock, flags);
} }
static inline void command_get(struct command *cmd) static inline void command_get(struct command *cmd)
{ {
kobject_get(&cmd->kobj); kref_get(&cmd->kref);
} }