mfd: altera-sysmgr: Fix physical address storing hacks (d9ca7801) · Commits · 戴 / test

Sparse reports: drivers/mfd/altera-sysmgr.c:150:30: warning: incorrect type in assignment (different address spaces) drivers/mfd/altera-sysmgr.c:150:30: expected unsigned int [usertype] *base drivers/mfd/altera-sysmgr.c:150:30: got void [noderef] <asn:2> * drivers/mfd/altera-sysmgr.c:156:26: warning: incorrect type in argument 3 (different address spaces) drivers/mfd/altera-sysmgr.c:156:26: expected void [noderef] <asn:2> *regs drivers/mfd/altera-sysmgr.c:156:26: got unsigned int [usertype] *base It appears as though the driver data property 'resource_size_t *base' was being used to store 2 different types of addresses (physical and IO-mapped) under a single declared type. Fortunately, no value is recalled from the driver data entry, so it can be easily omitted. Instead we can use the value obtained directly from the platform resource to pass through Regmap into the call-backs to be used for the SMCC call and use a local dedicated __iomem variable for IO-remapping. Cc: Thor Thayer <thor.thayer@linux.intel.com> Signed-off-by:

Lee Jones <lee.jones@linaro.org>

drivers/mfd/altera-sysmgr.c

+6 −10

Original line number	Diff line number	Diff line
		@@ -22,11 +22,9 @@
		/**
		* struct altr_sysmgr - Altera SOCFPGA System Manager
		* @regmap: the regmap used for System Manager accesses.
		* @base : the base address for the System Manager
		*/
		struct altr_sysmgr {
		struct regmap *regmap;
		resource_size_t *base;
		};

		static struct platform_driver altr_sysmgr_driver;
		@@ -127,6 +125,7 @@ static int sysmgr_probe(struct platform_device *pdev)
		struct regmap_config sysmgr_config = altr_sysmgr_regmap_cfg;
		struct device *dev = &pdev->dev;
		struct device_node *np = dev->of_node;
		void __iomem *base;

		sysmgr = devm_kzalloc(dev, sizeof(*sysmgr), GFP_KERNEL);
		if (!sysmgr)
		@@ -139,22 +138,19 @@ static int sysmgr_probe(struct platform_device *pdev)
		sysmgr_config.max_register = resource_size(res) -
		sysmgr_config.reg_stride;
		if (of_device_is_compatible(np, "altr,sys-mgr-s10")) {
		/* Need physical address for SMCC call */
		sysmgr->base = (resource_size_t *)res->start;
		sysmgr_config.reg_read = s10_protected_reg_read;
		sysmgr_config.reg_write = s10_protected_reg_write;

		regmap = devm_regmap_init(dev, NULL, sysmgr->base,
		/* Need physical address for SMCC call */
		regmap = devm_regmap_init(dev, NULL, (void *)res->start,
		&sysmgr_config);
		} else {
		sysmgr->base = devm_ioremap(dev, res->start,
		resource_size(res));
		if (!sysmgr->base)
		base = devm_ioremap(dev, res->start, resource_size(res));
		if (!base)
		return -ENOMEM;

		sysmgr_config.max_register = res->end - res->start - 3;
		regmap = devm_regmap_init_mmio(dev, sysmgr->base,
		&sysmgr_config);
		regmap = devm_regmap_init_mmio(dev, base, &sysmgr_config);
		}

		if (IS_ERR(regmap)) {

Admin message