mirror of
https://github.com/joel16/android_kernel_sony_msm8994_rework.git
synced 2024-12-27 14:35:32 +00:00
I2O: Fix "defined but not used" build warnings
drivers/message/i2o/exec-osm.c:539: warning: `i2o_exec_lct_notify' defined but not used comes when CONFIG_I2O_LCT_NOTIFY_ON_CHANGES=n, because its only callsite is #ifdef'ed as such. So let's #ifdef the function definition also. Also move the definition to before the callsite, to get rid of forward prototype. [akpm@linux-foundation.org: fix warnings] Signed-off-by: Satyam Sharma <satyam@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
9c0ca6f9a0
commit
c98673fee2
@ -41,8 +41,6 @@
|
|||||||
|
|
||||||
struct i2o_driver i2o_exec_driver;
|
struct i2o_driver i2o_exec_driver;
|
||||||
|
|
||||||
static int i2o_exec_lct_notify(struct i2o_controller *c, u32 change_ind);
|
|
||||||
|
|
||||||
/* global wait list for POST WAIT */
|
/* global wait list for POST WAIT */
|
||||||
static LIST_HEAD(i2o_exec_wait_list);
|
static LIST_HEAD(i2o_exec_wait_list);
|
||||||
|
|
||||||
@ -369,6 +367,53 @@ static int i2o_exec_remove(struct device *dev)
|
|||||||
return 0;
|
return 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#ifdef CONFIG_I2O_LCT_NOTIFY_ON_CHANGES
|
||||||
|
/**
|
||||||
|
* i2o_exec_lct_notify - Send a asynchronus LCT NOTIFY request
|
||||||
|
* @c: I2O controller to which the request should be send
|
||||||
|
* @change_ind: change indicator
|
||||||
|
*
|
||||||
|
* This function sends a LCT NOTIFY request to the I2O controller with
|
||||||
|
* the change indicator change_ind. If the change_ind == 0 the controller
|
||||||
|
* replies immediately after the request. If change_ind > 0 the reply is
|
||||||
|
* send after change indicator of the LCT is > change_ind.
|
||||||
|
*/
|
||||||
|
static int i2o_exec_lct_notify(struct i2o_controller *c, u32 change_ind)
|
||||||
|
{
|
||||||
|
i2o_status_block *sb = c->status_block.virt;
|
||||||
|
struct device *dev;
|
||||||
|
struct i2o_message *msg;
|
||||||
|
|
||||||
|
mutex_lock(&c->lct_lock);
|
||||||
|
|
||||||
|
dev = &c->pdev->dev;
|
||||||
|
|
||||||
|
if (i2o_dma_realloc
|
||||||
|
(dev, &c->dlct, le32_to_cpu(sb->expected_lct_size), GFP_KERNEL))
|
||||||
|
return -ENOMEM;
|
||||||
|
|
||||||
|
msg = i2o_msg_get_wait(c, I2O_TIMEOUT_MESSAGE_GET);
|
||||||
|
if (IS_ERR(msg))
|
||||||
|
return PTR_ERR(msg);
|
||||||
|
|
||||||
|
msg->u.head[0] = cpu_to_le32(EIGHT_WORD_MSG_SIZE | SGL_OFFSET_6);
|
||||||
|
msg->u.head[1] = cpu_to_le32(I2O_CMD_LCT_NOTIFY << 24 | HOST_TID << 12 |
|
||||||
|
ADAPTER_TID);
|
||||||
|
msg->u.s.icntxt = cpu_to_le32(i2o_exec_driver.context);
|
||||||
|
msg->u.s.tcntxt = cpu_to_le32(0x00000000);
|
||||||
|
msg->body[0] = cpu_to_le32(0xffffffff);
|
||||||
|
msg->body[1] = cpu_to_le32(change_ind);
|
||||||
|
msg->body[2] = cpu_to_le32(0xd0000000 | c->dlct.len);
|
||||||
|
msg->body[3] = cpu_to_le32(c->dlct.phys);
|
||||||
|
|
||||||
|
i2o_msg_post(c, msg);
|
||||||
|
|
||||||
|
mutex_unlock(&c->lct_lock);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* i2o_exec_lct_modified - Called on LCT NOTIFY reply
|
* i2o_exec_lct_modified - Called on LCT NOTIFY reply
|
||||||
* @_work: work struct for a specific controller
|
* @_work: work struct for a specific controller
|
||||||
@ -525,51 +570,6 @@ int i2o_exec_lct_get(struct i2o_controller *c)
|
|||||||
return rc;
|
return rc;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* i2o_exec_lct_notify - Send a asynchronus LCT NOTIFY request
|
|
||||||
* @c: I2O controller to which the request should be send
|
|
||||||
* @change_ind: change indicator
|
|
||||||
*
|
|
||||||
* This function sends a LCT NOTIFY request to the I2O controller with
|
|
||||||
* the change indicator change_ind. If the change_ind == 0 the controller
|
|
||||||
* replies immediately after the request. If change_ind > 0 the reply is
|
|
||||||
* send after change indicator of the LCT is > change_ind.
|
|
||||||
*/
|
|
||||||
static int i2o_exec_lct_notify(struct i2o_controller *c, u32 change_ind)
|
|
||||||
{
|
|
||||||
i2o_status_block *sb = c->status_block.virt;
|
|
||||||
struct device *dev;
|
|
||||||
struct i2o_message *msg;
|
|
||||||
|
|
||||||
mutex_lock(&c->lct_lock);
|
|
||||||
|
|
||||||
dev = &c->pdev->dev;
|
|
||||||
|
|
||||||
if (i2o_dma_realloc
|
|
||||||
(dev, &c->dlct, le32_to_cpu(sb->expected_lct_size), GFP_KERNEL))
|
|
||||||
return -ENOMEM;
|
|
||||||
|
|
||||||
msg = i2o_msg_get_wait(c, I2O_TIMEOUT_MESSAGE_GET);
|
|
||||||
if (IS_ERR(msg))
|
|
||||||
return PTR_ERR(msg);
|
|
||||||
|
|
||||||
msg->u.head[0] = cpu_to_le32(EIGHT_WORD_MSG_SIZE | SGL_OFFSET_6);
|
|
||||||
msg->u.head[1] = cpu_to_le32(I2O_CMD_LCT_NOTIFY << 24 | HOST_TID << 12 |
|
|
||||||
ADAPTER_TID);
|
|
||||||
msg->u.s.icntxt = cpu_to_le32(i2o_exec_driver.context);
|
|
||||||
msg->u.s.tcntxt = cpu_to_le32(0x00000000);
|
|
||||||
msg->body[0] = cpu_to_le32(0xffffffff);
|
|
||||||
msg->body[1] = cpu_to_le32(change_ind);
|
|
||||||
msg->body[2] = cpu_to_le32(0xd0000000 | c->dlct.len);
|
|
||||||
msg->body[3] = cpu_to_le32(c->dlct.phys);
|
|
||||||
|
|
||||||
i2o_msg_post(c, msg);
|
|
||||||
|
|
||||||
mutex_unlock(&c->lct_lock);
|
|
||||||
|
|
||||||
return 0;
|
|
||||||
};
|
|
||||||
|
|
||||||
/* Exec OSM driver struct */
|
/* Exec OSM driver struct */
|
||||||
struct i2o_driver i2o_exec_driver = {
|
struct i2o_driver i2o_exec_driver = {
|
||||||
.name = OSM_NAME,
|
.name = OSM_NAME,
|
||||||
|
Loading…
Reference in New Issue
Block a user