diff options
| author | David S. Miller <davem@davemloft.net> | 2012-01-29 22:11:26 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-01-29 22:11:26 +0100 |
| commit | 30088a25e9c4dc1f8bd5c48b14a18633441b5481 (patch) | |
| tree | 522124a1ec4b39d18f3af6c8f3a169f59aee9de9 /drivers/net/ethernet/sfc/mtd.c | |
| parent | ipv6: Eliminate dst_get_neighbour_noref() usage in ip6_forward(). (diff) | |
| parent | sfc: Replace efx_rx_buffer::is_page and other booleans with a flags field (diff) | |
| download | linux-30088a25e9c4dc1f8bd5c48b14a18633441b5481.tar.xz linux-30088a25e9c4dc1f8bd5c48b14a18633441b5481.zip | |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/bwh/sfc-next
Diffstat (limited to 'drivers/net/ethernet/sfc/mtd.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/mtd.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/ethernet/sfc/mtd.c b/drivers/net/ethernet/sfc/mtd.c index bc9dcd6b30d7..eff49da458ed 100644 --- a/drivers/net/ethernet/sfc/mtd.c +++ b/drivers/net/ethernet/sfc/mtd.c @@ -10,6 +10,7 @@ #include <linux/bitops.h> #include <linux/module.h> +#undef DEBUG /* <linux/mtd/mtd.h> has its own use for DEBUG */ #include <linux/mtd/mtd.h> #include <linux/delay.h> #include <linux/slab.h> @@ -382,7 +383,7 @@ static int falcon_mtd_sync(struct mtd_info *mtd) return rc; } -static struct efx_mtd_ops falcon_mtd_ops = { +static const struct efx_mtd_ops falcon_mtd_ops = { .read = falcon_mtd_read, .erase = falcon_mtd_erase, .write = falcon_mtd_write, @@ -560,7 +561,7 @@ static int siena_mtd_sync(struct mtd_info *mtd) return rc; } -static struct efx_mtd_ops siena_mtd_ops = { +static const struct efx_mtd_ops siena_mtd_ops = { .read = siena_mtd_read, .erase = siena_mtd_erase, .write = siena_mtd_write, @@ -572,7 +573,7 @@ struct siena_nvram_type_info { const char *name; }; -static struct siena_nvram_type_info siena_nvram_types[] = { +static const struct siena_nvram_type_info siena_nvram_types[] = { [MC_CMD_NVRAM_TYPE_DISABLED_CALLISTO] = { 0, "sfc_dummy_phy" }, [MC_CMD_NVRAM_TYPE_MC_FW] = { 0, "sfc_mcfw" }, [MC_CMD_NVRAM_TYPE_MC_FW_BACKUP] = { 0, "sfc_mcfw_backup" }, @@ -593,7 +594,7 @@ static int siena_mtd_probe_partition(struct efx_nic *efx, unsigned int type) { struct efx_mtd_partition *part = &efx_mtd->part[part_id]; - struct siena_nvram_type_info *info; + const struct siena_nvram_type_info *info; size_t size, erase_size; bool protected; int rc; @@ -627,11 +628,10 @@ static int siena_mtd_get_fw_subtypes(struct efx_nic *efx, struct efx_mtd *efx_mtd) { struct efx_mtd_partition *part; - uint16_t fw_subtype_list[MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_LEN / - sizeof(uint16_t)]; + uint16_t fw_subtype_list[MC_CMD_GET_BOARD_CFG_OUT_FW_SUBTYPE_LIST_MINNUM]; int rc; - rc = efx_mcdi_get_board_cfg(efx, NULL, fw_subtype_list); + rc = efx_mcdi_get_board_cfg(efx, NULL, fw_subtype_list, NULL); if (rc) return rc; |