aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2014-06-13 21:40:45 +0100
committerShow Liu <show.liu@linaro.org>2014-06-18 12:05:38 +0800
commitb604ab389db043988bc6c5a211dd1889091db871 (patch)
tree49e74cc5e02cacd7137ddb1417a19f8c2aa4be83
parent1290af03c511ec080c6d5f1211a15acd3de49f98 (diff)
downloadlinaro-lsk-b604ab389db043988bc6c5a211dd1889091db871.tar.gz
mailbox: Remove const from client argument of mbox_request_channel()
The struct mbox_client supplied to mbox_request_channel() is const but it is stored in the channel in a non-constant member causing compiler warnings. While the mailbox API should treat the struct mailbox_client as const itself the struct is passed back to the channel in callbacks without a const so we need to either remove the const, change the callbacks to take const or cast the const away when doing callbacks. Take the simplest option and just remove the const. Signed-off-by: Mark Brown <broonie@linaro.org>
-rw-r--r--drivers/mailbox/mailbox.c2
-rw-r--r--include/linux/mailbox_client.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c
index ae4abd9f751..662f8e55047 100644
--- a/drivers/mailbox/mailbox.c
+++ b/drivers/mailbox/mailbox.c
@@ -294,7 +294,7 @@ EXPORT_SYMBOL_GPL(mbox_send_message);
* Return: Pointer to the channel assigned to the client if successful.
* ERR_PTR for request failure.
*/
-struct mbox_chan *mbox_request_channel(const struct mbox_client *cl)
+struct mbox_chan *mbox_request_channel(struct mbox_client *cl)
{
struct device *dev = cl->dev;
struct mbox_controller *mbox;
diff --git a/include/linux/mailbox_client.h b/include/linux/mailbox_client.h
index cbfcf8478ca..955f3d7641e 100644
--- a/include/linux/mailbox_client.h
+++ b/include/linux/mailbox_client.h
@@ -37,7 +37,7 @@ struct mbox_client {
bool knows_txdone;
};
-struct mbox_chan *mbox_request_channel(const struct mbox_client *cl);
+struct mbox_chan *mbox_request_channel(struct mbox_client *cl);
int mbox_send_message(struct mbox_chan *chan, void *mssg);
void mbox_client_txdone(struct mbox_chan *chan, int r);
bool mbox_client_peek_data(struct mbox_chan *chan);