Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

disk: sdmmc: runtime structure initialisation #83858

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

disk: sdmmc: runtime structure initialisation #83858

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 8 additions & 10 deletions drivers/disk/sdmmc_subsys.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,13 @@ enum sd_status {

struct sdmmc_config {
const struct device *host_controller;
const char *name;
};

struct sdmmc_data {
struct sd_card card;
enum sd_status status;
struct disk_info *disk_info;
struct disk_info disk_info;
};


Expand Down Expand Up @@ -113,27 +114,24 @@ static const struct disk_operations sdmmc_disk_ops = {

static int disk_sdmmc_init(const struct device *dev)
{
const struct sdmmc_config *config = dev->config;
struct sdmmc_data *data = dev->data;

data->status = SD_UNINIT;
data->disk_info.name = config->name;
data->disk_info.ops = &sdmmc_disk_ops;
data->disk_info.dev = dev;

return disk_access_register(data->disk_info);
return disk_access_register(&data->disk_info);
}

#define DISK_ACCESS_SDMMC_INIT(n) \
static const struct sdmmc_config sdmmc_config_##n = { \
.host_controller = DEVICE_DT_GET(DT_INST_PARENT(n)), \
}; \
\
static struct disk_info sdmmc_disk_##n = { \
.name = DT_INST_PROP(n, disk_name), \
.ops = &sdmmc_disk_ops, \
.dev = DEVICE_DT_INST_GET(n), \
}; \
\
static struct sdmmc_data sdmmc_data_##n = { \
.disk_info = &sdmmc_disk_##n, \
}; \
static struct sdmmc_data sdmmc_data_##n; \
\
DEVICE_DT_INST_DEFINE(n, \
&disk_sdmmc_init, \
Expand Down
Loading