Message ID | 1503665035-16231-2-git-send-email-adrian.hunter@intel.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 25 August 2017 at 14:43, Adrian Hunter <adrian.hunter@intel.com> wrote: > mmc_start_areq() is an internal mmc core API. Move the declaration > accordingly. > > Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Thanks, applied for next! Kind regards Uffe > --- > drivers/mmc/core/core.h | 6 ++++++ > include/linux/mmc/core.h | 4 ---- > 2 files changed, 6 insertions(+), 4 deletions(-) > > diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h > index 55f543fd37c4..ca861091a776 100644 > --- a/drivers/mmc/core/core.h > +++ b/drivers/mmc/core/core.h > @@ -107,6 +107,12 @@ static inline void mmc_unregister_pm_notifier(struct mmc_host *host) { } > void mmc_wait_for_req_done(struct mmc_host *host, struct mmc_request *mrq); > bool mmc_is_req_done(struct mmc_host *host, struct mmc_request *mrq); > > +struct mmc_async_req; > + > +struct mmc_async_req *mmc_start_areq(struct mmc_host *host, > + struct mmc_async_req *areq, > + enum mmc_blk_status *ret_stat); > + > int mmc_erase(struct mmc_card *card, unsigned int from, unsigned int nr, > unsigned int arg); > int mmc_can_erase(struct mmc_card *card); > diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h > index bf1788a224e6..178f699ac172 100644 > --- a/include/linux/mmc/core.h > +++ b/include/linux/mmc/core.h > @@ -165,11 +165,7 @@ struct mmc_request { > }; > > struct mmc_card; > -struct mmc_async_req; > > -struct mmc_async_req *mmc_start_areq(struct mmc_host *host, > - struct mmc_async_req *areq, > - enum mmc_blk_status *ret_stat); > void mmc_wait_for_req(struct mmc_host *host, struct mmc_request *mrq); > int mmc_wait_for_cmd(struct mmc_host *host, struct mmc_command *cmd, > int retries); > -- > 1.9.1 >
diff --git a/drivers/mmc/core/core.h b/drivers/mmc/core/core.h index 55f543fd37c4..ca861091a776 100644 --- a/drivers/mmc/core/core.h +++ b/drivers/mmc/core/core.h @@ -107,6 +107,12 @@ static inline void mmc_unregister_pm_notifier(struct mmc_host *host) { } void mmc_wait_for_req_done(struct mmc_host *host, struct mmc_request *mrq); bool mmc_is_req_done(struct mmc_host *host, struct mmc_request *mrq); +struct mmc_async_req; + +struct mmc_async_req *mmc_start_areq(struct mmc_host *host, + struct mmc_async_req *areq, + enum mmc_blk_status *ret_stat); + int mmc_erase(struct mmc_card *card, unsigned int from, unsigned int nr, unsigned int arg); int mmc_can_erase(struct mmc_card *card); diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h index bf1788a224e6..178f699ac172 100644 --- a/include/linux/mmc/core.h +++ b/include/linux/mmc/core.h @@ -165,11 +165,7 @@ struct mmc_request { }; struct mmc_card; -struct mmc_async_req; -struct mmc_async_req *mmc_start_areq(struct mmc_host *host, - struct mmc_async_req *areq, - enum mmc_blk_status *ret_stat); void mmc_wait_for_req(struct mmc_host *host, struct mmc_request *mrq); int mmc_wait_for_cmd(struct mmc_host *host, struct mmc_command *cmd, int retries);
mmc_start_areq() is an internal mmc core API. Move the declaration accordingly. Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> --- drivers/mmc/core/core.h | 6 ++++++ include/linux/mmc/core.h | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-)