Re: [PATCH] EDAC/{i10nm,skx,skx_common}: Support multiple clumps

[Luck, Tony]

> +int skx_get_src_id(struct skx_dev *d, int off, u8 *id)
> +{
> +#ifdef CONFIG_NUMA
> +	return skx_get_pkg_id(d, id);
> +#else
> +	u32 reg;
> +
> +	if (pci_read_config_dword(d->util_all, off, &reg)) {
> +		skx_printk(KERN_ERR, "Failed to read src id\n");
> +		return -ENODEV;
> +	}
> +
> +	*id = GET_BITFIELD(reg, 12, 14);
> +	return 0;
> +#endif

Doh ... I alwasy forget about IS_ENABLED(). This can be written:


int skx_get_src_id(struct skx_dev *d, int off, u8 *id)
{
	u32 reg;

	if (IS_ENABLED(CONFIG_NUMA))
		return skx_get_pkg_id(d, id);

	if (pci_read_config_dword(d->util_all, off, &reg)) {
		skx_printk(KERN_ERR, "Failed to read src id\n");
		return -ENODEV;
	}

	*id = GET_BITFIELD(reg, 12, 14);
	return 0;
}

-Tony