diff options
Diffstat (limited to 'drivers/fpga/fpga-bridge.c')
| -rw-r--r-- | drivers/fpga/fpga-bridge.c | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/drivers/fpga/fpga-bridge.c b/drivers/fpga/fpga-bridge.c index 6f9e943de9..5db24cb5bd 100644 --- a/drivers/fpga/fpga-bridge.c +++ b/drivers/fpga/fpga-bridge.c @@ -1,20 +1,10 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * FPGA Bridge Framework Driver * * Copyright (C) 2013-2016 Altera Corporation, All Rights Reserved. - * - * This program is free software; you can redistribute it and/or modify it - * under the terms and conditions of the GNU General Public License, - * version 2, as published by the Free Software Foundation. - * - * This program is distributed in the hope it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - * more details. - * - * You should have received a copy of the GNU General Public License along with - * this program. If not, see <http://www.gnu.org/licenses/>. */ + #include <common.h> #include <fpga-bridge.h> @@ -66,7 +56,7 @@ EXPORT_SYMBOL_GPL(fpga_bridge_disable); struct fpga_bridge *of_fpga_bridge_get(struct device_node *np) { - struct device_d *dev; + struct device *dev; struct fpga_bridge *bridge; int ret = -EPROBE_DEFER; @@ -189,7 +179,7 @@ static int set_enable(struct param_d *p, void *priv) * * Return: 0 for success, error code otherwise. */ -int fpga_bridge_register(struct device_d *dev, const char *name, +int fpga_bridge_register(struct device *dev, const char *name, const struct fpga_bridge_ops *br_ops, void *priv) { struct fpga_bridge *bridge; @@ -211,7 +201,7 @@ int fpga_bridge_register(struct device_d *dev, const char *name, bridge->priv = priv; bridge->dev.parent = dev; - bridge->dev.device_node = dev->device_node; + bridge->dev.of_node = dev->of_node; bridge->dev.id = DEVICE_ID_DYNAMIC; bridge->dev.name = xstrdup(name); @@ -228,7 +218,7 @@ int fpga_bridge_register(struct device_d *dev, const char *name, if (IS_ERR(p)) return PTR_ERR(p); - of_platform_populate(dev->device_node, NULL, dev); + of_platform_populate(dev->of_node, NULL, dev); dev_info(bridge->dev.parent, "fpga bridge [%s] registered\n", bridge->dev.name); |