Skip to content

F
FMC Software Support
Commit 116839de authored by Federico Vaga's avatar Federico Vaga
Browse files
Options

Merge branch 'release/v1.0.0'

parents 9a1d8ead 50d52004
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 9 deletions
CHANGELOG
View file @ 116839de
=========
Changelog
=========
[1.0.0] - 2019-09-26
====================
Changes
-------
- better ``printk()`` output
- better use of ``memcpy()``
[0.9.1] - 2019-09-09
--------------------
====================
Added
~~~~~
-----
- First stable implementation of FMC framework
drivers/fmc/fmc-core.c
View file @ 116839de
......@@ -301,14 +301,12 @@ int fmc_carrier_register(struct device *parent,
for (i = 0; i < carrier->slot_nr; ++i) {
carrier->slot[i] = fmc_carrier_add_slot(carrier, &slot_info[i]);
if (IS_ERR_OR_NULL(carrier->slot[i])) {
dev_err(&carrier->dev, "Failed to add slot %d\n", i);
dev_err(&carrier->dev, "Failed to add slot %d\n", i);
err = -EINVAL;
goto err_slot;
}
}
dev_info(parent, "FMC carrier registration: success\n");
return 0;
err_slot:
......@@ -321,7 +319,7 @@ err_name:
err_alloc:
ida_simple_remove(&fmc_carrier_ida, id);
err_ida:
dev_err(parent, "FMC carrier registration: fail\n");
dev_err(parent, "FMC carrier registration: failed %d\n", err);
return err;
}
EXPORT_SYMBOL(fmc_carrier_register);
......
drivers/fmc/fmc-eeprom.c
View file @ 116839de
......@@ -56,7 +56,7 @@ static void fmc_slot_eeprom_init_default(struct fmc_slot *slot,
{
memset(info, 0, sizeof(*info));
fmc_slot_eeprom_init(slot, info, FMC_EEPROM_TYPE_DEFAULT);
memcpy(&slot->at24_data, &at24_24c02, sizeof(at24_24c02));
memcpy(&slot->at24_data, &at24_24c02, sizeof(slot->at24_data));
slot->at24_data.context = slot;
}
......@@ -196,8 +196,8 @@ int fmc_slot_eeprom_type_set(struct fmc_slot *slot, const char *type)
}
memset(&i2c_info, 0, sizeof(struct i2c_board_info));
memset(&slot->at24_data, 0, sizeof(struct at24_platform_data));
memset(&i2c_info, 0, sizeof(i2c_info));
memset(&slot->at24_data, 0, sizeof(slot->at24_data));
len = (len * 1024) / 8;
/*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment