evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: unisys: finddevice() doesn't need to be inline

Browse source 
Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Benjamin Romer <benjamin.romer@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Jes Sorensen 2015-05-05 18:35:54 -04:00 • committed by Greg Kroah-Hartman
parent 92b5e8c0ac
commit d480f6a2b9
2 changed files with 23 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
drivers/staging/unisys/visorchipset/visorchipset.h
View file

@ -91,18 +91,6 @@ struct visorchipset_device_info {
void *bus_driver_context; void *bus_driver_context;
}; };
static inline struct visorchipset_device_info *finddevice(
struct list_head *list, u32 bus_no, u32 dev_no)
{
struct visorchipset_device_info *p;
list_for_each_entry(p, list, entry) {
if (p->bus_no == bus_no && p->dev_no == dev_no)
return p;
}
return NULL;
}
static inline void delbusdevices(struct list_head *list, u32 bus_no) static inline void delbusdevices(struct list_head *list, u32 bus_no)
{ {
struct visorchipset_device_info *p, *tmp; struct visorchipset_device_info *p, *tmp;

32
drivers/staging/unisys/visorchipset/visorchipset_main.c
View file

@ -539,6 +539,19 @@ bus_find(struct list_head *list, u32 bus_no)
return NULL; return NULL;
} }
static struct visorchipset_device_info *
device_find(struct list_head *list, u32 bus_no, u32 dev_no)
{
struct visorchipset_device_info *p;
list_for_each_entry(p, list, entry) {
if (p->bus_no == bus_no && p->dev_no == dev_no)
return p;
}
return NULL;
}
static u8 static u8
check_chipset_events(void) check_chipset_events(void)
{ {
@ -825,7 +838,7 @@ device_changestate_responder(enum controlvm_id cmd_id,
struct visorchipset_device_info *p; struct visorchipset_device_info *p;
struct controlvm_message outmsg; struct controlvm_message outmsg;
p = finddevice(&dev_info_list, bus_no, dev_no); p = device_find(&dev_info_list, bus_no, dev_no);
if (!p) if (!p)
return; return;
if (p->pending_msg_hdr.id == CONTROLVM_INVALID) if (p->pending_msg_hdr.id == CONTROLVM_INVALID)
@ -852,7 +865,7 @@ device_responder(enum controlvm_id cmd_id, u32 bus_no, u32 dev_no, int response)
struct visorchipset_device_info *p; struct visorchipset_device_info *p;
bool need_clear = false; bool need_clear = false;
p = finddevice(&dev_info_list, bus_no, dev_no); p = device_find(&dev_info_list, bus_no, dev_no);
if (!p) if (!p)
return; return;
if (response >= 0) { if (response >= 0) {
@ -951,7 +964,7 @@ device_epilog(u32 bus_no, u32 dev_no, struct spar_segment_state state, u32 cmd,
bool notified = false; bool notified = false;
struct visorchipset_device_info *dev_info = struct visorchipset_device_info *dev_info =
finddevice(&dev_info_list, bus_no, dev_no); device_find(&dev_info_list, bus_no, dev_no);
char *envp[] = { char *envp[] = {
"SPARSP_DIAGPOOL_PAUSED_STATE = 1", "SPARSP_DIAGPOOL_PAUSED_STATE = 1",
NULL NULL
@ -1157,7 +1170,7 @@ my_device_create(struct controlvm_message *inmsg)
struct visorchipset_bus_info *bus_info; struct visorchipset_bus_info *bus_info;
int rc = CONTROLVM_RESP_SUCCESS; int rc = CONTROLVM_RESP_SUCCESS;
dev_info = finddevice(&dev_info_list, bus_no, dev_no); dev_info = device_find(&dev_info_list, bus_no, dev_no);
if (dev_info && (dev_info->state.created == 1)) { if (dev_info && (dev_info->state.created == 1)) {
POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no, POSTCODE_LINUX_4(DEVICE_CREATE_FAILURE_PC, dev_no, bus_no,
POSTCODE_SEVERITY_ERR); POSTCODE_SEVERITY_ERR);
@ -1227,7 +1240,7 @@ my_device_changestate(struct controlvm_message *inmsg)
struct visorchipset_device_info *dev_info; struct visorchipset_device_info *dev_info;
int rc = CONTROLVM_RESP_SUCCESS; int rc = CONTROLVM_RESP_SUCCESS;
dev_info = finddevice(&dev_info_list, bus_no, dev_no); dev_info = device_find(&dev_info_list, bus_no, dev_no);
if (!dev_info) { if (!dev_info) {
POSTCODE_LINUX_4(DEVICE_CHANGESTATE_FAILURE_PC, dev_no, bus_no, POSTCODE_LINUX_4(DEVICE_CHANGESTATE_FAILURE_PC, dev_no, bus_no,
POSTCODE_SEVERITY_ERR); POSTCODE_SEVERITY_ERR);
@ -1254,7 +1267,7 @@ my_device_destroy(struct controlvm_message *inmsg)
struct visorchipset_device_info *dev_info; struct visorchipset_device_info *dev_info;
int rc = CONTROLVM_RESP_SUCCESS; int rc = CONTROLVM_RESP_SUCCESS;
dev_info = finddevice(&dev_info_list, bus_no, dev_no); dev_info = device_find(&dev_info_list, bus_no, dev_no);
if (!dev_info) if (!dev_info)
rc = -CONTROLVM_RESP_ERROR_DEVICE_INVALID; rc = -CONTROLVM_RESP_ERROR_DEVICE_INVALID;
else if (dev_info->state.created == 0) else if (dev_info->state.created == 0)
@ -2033,7 +2046,7 @@ bool
visorchipset_get_device_info(u32 bus_no, u32 dev_no, visorchipset_get_device_info(u32 bus_no, u32 dev_no,
struct visorchipset_device_info *dev_info) struct visorchipset_device_info *dev_info)
{ {
void *p = finddevice(&dev_info_list, bus_no, dev_no); void *p = device_find(&dev_info_list, bus_no, dev_no);
if (!p) if (!p)
return false; return false;
@ -2045,8 +2058,9 @@ EXPORT_SYMBOL_GPL(visorchipset_get_device_info);
bool bool
visorchipset_set_device_context(u32 bus_no, u32 dev_no, void *context) visorchipset_set_device_context(u32 bus_no, u32 dev_no, void *context)
{ {
struct visorchipset_device_info *p = struct visorchipset_device_info *p;
finddevice(&dev_info_list, bus_no, dev_no);
p = device_find(&dev_info_list, bus_no, dev_no);
if (!p) if (!p)
return false; return false;