Merge tag 'mvebu-drivers-5.6-1' of git://git.infradead.org/linux-mvebu into arm/drivers (c7ce73eb) · Commits · 戴 / test

drivers/bus/moxtet.c

+1 −2

Original line number	Diff line number	Diff line
		@@ -102,12 +102,11 @@ static int moxtet_match(struct device dev, struct device_driver drv)
		return 0;
		}

		struct bus_type moxtet_bus_type = {
		static struct bus_type moxtet_bus_type = {
		.name = "moxtet",
		.dev_groups = moxtet_dev_groups,
		.match = moxtet_match,
		};
		EXPORT_SYMBOL_GPL(moxtet_bus_type);

		int __moxtet_register_driver(struct module *owner,
		struct moxtet_driver *mdrv)

+1 −4

Original line number	Diff line number	Diff line
		@@ -143,7 +143,6 @@ static const struct mbox_chan_ops a37xx_mbox_ops = {
		static int armada_37xx_mbox_probe(struct platform_device *pdev)
		{
		struct a37xx_mbox *mbox;
		struct resource *regs;
		struct mbox_chan *chans;
		int ret;

		@@ -156,9 +155,7 @@ static int armada_37xx_mbox_probe(struct platform_device *pdev)
		if (!chans)
		return -ENOMEM;

		regs = platform_get_resource(pdev, IORESOURCE_MEM, 0);

		mbox->base = devm_ioremap_resource(&pdev->dev, regs);
		mbox->base = devm_platform_ioremap_resource(pdev, 0);
		if (IS_ERR(mbox->base)) {
		dev_err(&pdev->dev, "ioremap failed\n");
		return PTR_ERR(mbox->base);

+1 −3

Original line number	Diff line number	Diff line
		@@ -267,7 +267,6 @@ static int mvebu_devbus_probe(struct platform_device *pdev)
		struct devbus_read_params r;
		struct devbus_write_params w;
		struct devbus *devbus;
		struct resource *res;
		struct clk *clk;
		unsigned long rate;
		int err;
		@@ -277,8 +276,7 @@ static int mvebu_devbus_probe(struct platform_device *pdev)
		return -ENOMEM;

		devbus->dev = dev;
		res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		devbus->base = devm_ioremap_resource(&pdev->dev, res);
		devbus->base = devm_platform_ioremap_resource(pdev, 0);
		if (IS_ERR(devbus->base))
		return PTR_ERR(devbus->base);

+1 −1

File changed.

Contains only whitespace changes.