diff options
Diffstat (limited to 'drivers/pinctrl/pinctrl-single.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-single.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/drivers/pinctrl/pinctrl-single.c b/drivers/pinctrl/pinctrl-single.c index cf2f724d18..0e706656b9 100644 --- a/drivers/pinctrl/pinctrl-single.c +++ b/drivers/pinctrl/pinctrl-single.c @@ -1,18 +1,9 @@ +// SPDX-License-Identifier: GPL-2.0-only /* * pinctrl-single - Generic device tree based pinctrl driver for one * register per pin type pinmux controllers * * Copyright (c) 2013 Sascha Hauer <s.hauer@pengutronix.de> - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 - * as published by the Free Software Foundation. - * - * This program is distributed in the hope that 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. - * */ #include <common.h> @@ -73,7 +64,7 @@ static int pcs_set_state(struct pinctrl_device *pdev, struct device_node *np) unsigned int offset, val, rows, mask, reg, i; const __be32 *mux; - dev_dbg(pcs->pinctrl.dev, "set state: %s\n", np->full_name); + dev_dbg(pcs->pinctrl.dev, "set state: %pOF\n", np); if (pcs->bits_per_mux) { mux = of_get_property(np, "pinctrl-single,bits", &size); if (size % 3 != 0) @@ -98,8 +89,7 @@ static int pcs_set_state(struct pinctrl_device *pdev, struct device_node *np) size /= sizeof(*mux); /* Number of elements in array */ if (!mux || !size || (size % (pcs->args_count + 1))) { - dev_err(pcs->pinctrl.dev, "bad data for mux %s\n", - np->full_name); + dev_err(pcs->pinctrl.dev, "bad data for mux %pOF\n", np); return -EINVAL; } @@ -128,11 +118,11 @@ static struct pinctrl_ops pcs_ops = { .set_state = pcs_set_state, }; -int pinctrl_single_probe(struct device_d *dev) +int pinctrl_single_probe(struct device *dev) { struct resource *iores; struct pinctrl_single *pcs; - struct device_node *np = dev->device_node; + struct device_node *np = dev->of_node; int ret = 0; pcs = xzalloc(sizeof(*pcs)); @@ -212,8 +202,9 @@ static __maybe_unused struct of_device_id pcs_dt_ids[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, pcs_dt_ids); -static struct driver_d pcs_driver = { +static struct driver pcs_driver = { .name = "pinctrl-single", .probe = pinctrl_single_probe, .of_compatible = DRV_OF_COMPAT(pcs_dt_ids), |