Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55244c56 authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: core: Move public functions from core.h to private headers 



A significant amount of functions are available through the public mmc
core.h header file. Let's slim down this public mmc interface, as to
prevent users from abusing it, by moving some of the functions to private
mmc header files.

This change concentrates on moving the functions into private mmc headers,
following changes may continue with additional clean-ups, as an example
some functions can be turned into static.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Reviewed-by: default avatarShawn Lin <shawn.lin@rock-chips.com>
parent 066185d6

drivers/mmc/core/block.c

+3 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@ 


#include "queue.h"

#include "block.h"

#include "core.h"

#include "mmc_ops.h"

#include "sd_ops.h"



MODULE_ALIAS("mmc:block");

#ifdef MODULE_PARAM_PREFIX

drivers/mmc/core/core.h

+36 −1
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 


struct mmc_host;

struct mmc_card;

struct mmc_request;



#define MMC_CMD_RETRIES        3
@@ -73,6 +74,7 @@ void mmc_start_host(struct mmc_host *host); 
void mmc_stop_host(struct mmc_host *host);



int _mmc_detect_card_removed(struct mmc_host *host);

int mmc_detect_card_removed(struct mmc_host *host);



int mmc_attach_mmc(struct mmc_host *host);

int mmc_attach_sd(struct mmc_host *host);
@@ -102,5 +104,38 @@ static inline void mmc_register_pm_notifier(struct mmc_host *host) { } 
static inline void mmc_unregister_pm_notifier(struct mmc_host *host) { }

#endif



#endif

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);



int mmc_erase(struct mmc_card *card, unsigned int from, unsigned int nr,

		unsigned int arg);

int mmc_can_erase(struct mmc_card *card);

int mmc_can_trim(struct mmc_card *card);

int mmc_can_discard(struct mmc_card *card);

int mmc_can_sanitize(struct mmc_card *card);

int mmc_can_secure_erase_trim(struct mmc_card *card);

int mmc_erase_group_aligned(struct mmc_card *card, unsigned int from,

			unsigned int nr);

unsigned int mmc_calc_max_discard(struct mmc_card *card);



int mmc_set_blocklen(struct mmc_card *card, unsigned int blocklen);

int mmc_set_blockcount(struct mmc_card *card, unsigned int blockcount,

			bool is_rel_write);



int __mmc_claim_host(struct mmc_host *host, atomic_t *abort);

void mmc_release_host(struct mmc_host *host);

void mmc_get_card(struct mmc_card *card);

void mmc_put_card(struct mmc_card *card);



/**

 *	mmc_claim_host - exclusively claim a host

 *	@host: mmc host to claim

 *

 *	Claim a host for a set of operations.

 */

static inline void mmc_claim_host(struct mmc_host *host)

{

	__mmc_claim_host(host, NULL);

}



#endif

drivers/mmc/core/mmc_ops.h

+9 −0
Original line number Diff line number Diff line
@@ -31,12 +31,21 @@ int mmc_spi_read_ocr(struct mmc_host *host, int highcap, u32 *ocrp); 
int mmc_spi_set_crc(struct mmc_host *host, int use_crc);

int mmc_bus_test(struct mmc_card *card, u8 bus_width);

int mmc_send_hpi_cmd(struct mmc_card *card, u32 *status);

int mmc_interrupt_hpi(struct mmc_card *card);

int mmc_can_ext_csd(struct mmc_card *card);

int mmc_get_ext_csd(struct mmc_card *card, u8 **new_ext_csd);

int mmc_switch_status(struct mmc_card *card);

int __mmc_switch_status(struct mmc_card *card, bool crc_err_fatal);

int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,

		unsigned int timeout_ms, unsigned char timing,

		bool use_busy_signal, bool send_status,	bool retry_crc_err);

int mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,

		unsigned int timeout_ms);

int mmc_stop_bkops(struct mmc_card *card);

int mmc_read_bkops_status(struct mmc_card *card);

void mmc_start_bkops(struct mmc_card *card, bool from_exception);

int mmc_can_reset(struct mmc_card *card);

int mmc_flush_cache(struct mmc_card *card);



#endif

drivers/mmc/core/mmc_test.c

+2 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ 
#include <linux/seq_file.h>

#include <linux/module.h>



#include "core.h"



#define RESULT_OK		0

#define RESULT_FAIL		1

#define RESULT_UNSUP_HOST	2

drivers/mmc/core/queue.c

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 


#include "queue.h"

#include "block.h"

#include "core.h"



#define MMC_QUEUE_BOUNCESZ	65536