* [PATCH] serial: 8250_exar: Constify the software nodes
@ 2021-03-04 8:13 Heikki Krogerus
2021-03-04 15:53 ` Andy Shevchenko
0 siblings, 1 reply; 2+ messages in thread
From: Heikki Krogerus @ 2021-03-04 8:13 UTC (permalink / raw)
To: Greg Kroah-Hartman; +Cc: Andy Shevchenko, Sudip Mukherjee, linux-serial
Software node is always created for additional device
properties. If the properties are constant, the software
node can also be constant.
Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
---
drivers/tty/serial/8250/8250_exar.c | 17 +++++++++++++----
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c
index 2d0e7c7e408dc..2f49c580139b8 100644
--- a/drivers/tty/serial/8250/8250_exar.c
+++ b/drivers/tty/serial/8250/8250_exar.c
@@ -354,7 +354,7 @@ static void setup_gpio(struct pci_dev *pcidev, u8 __iomem *p)
static void *
__xr17v35x_register_gpio(struct pci_dev *pcidev,
- const struct property_entry *properties)
+ const struct software_node *node)
{
struct platform_device *pdev;
@@ -365,7 +365,7 @@ __xr17v35x_register_gpio(struct pci_dev *pcidev,
pdev->dev.parent = &pcidev->dev;
ACPI_COMPANION_SET(&pdev->dev, ACPI_COMPANION(&pcidev->dev));
- if (platform_device_add_properties(pdev, properties) < 0 ||
+ if (device_add_software_node(&pdev->dev, node) < 0 ||
platform_device_add(pdev) < 0) {
platform_device_put(pdev);
return NULL;
@@ -380,12 +380,16 @@ static const struct property_entry exar_gpio_properties[] = {
{ }
};
+static const struct software_node exar_gpio_node = {
+ .properties = exar_gpio_properties,
+};
+
static int xr17v35x_register_gpio(struct pci_dev *pcidev,
struct uart_8250_port *port)
{
if (pcidev->vendor == PCI_VENDOR_ID_EXAR)
port->port.private_data =
- __xr17v35x_register_gpio(pcidev, exar_gpio_properties);
+ __xr17v35x_register_gpio(pcidev, &exar_gpio_node);
return 0;
}
@@ -457,6 +461,10 @@ static const struct property_entry iot2040_gpio_properties[] = {
{ }
};
+static const struct software_node iot2040_gpio_node = {
+ .properties = iot2040_gpio_properties,
+};
+
static int iot2040_register_gpio(struct pci_dev *pcidev,
struct uart_8250_port *port)
{
@@ -468,7 +476,7 @@ static int iot2040_register_gpio(struct pci_dev *pcidev,
writeb(IOT2040_UARTS_GPIO_HI_MODE, p + UART_EXAR_MPIOSEL_15_8);
port->port.private_data =
- __xr17v35x_register_gpio(pcidev, iot2040_gpio_properties);
+ __xr17v35x_register_gpio(pcidev, &iot2040_gpio_node);
return 0;
}
@@ -547,6 +555,7 @@ static void pci_xr17v35x_exit(struct pci_dev *pcidev)
struct uart_8250_port *port = serial8250_get_port(priv->line[0]);
struct platform_device *pdev = port->port.private_data;
+ device_remove_software_node(&pdev->dev);
platform_device_unregister(pdev);
port->port.private_data = NULL;
}
--
2.30.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] serial: 8250_exar: Constify the software nodes
2021-03-04 8:13 [PATCH] serial: 8250_exar: Constify the software nodes Heikki Krogerus
@ 2021-03-04 15:53 ` Andy Shevchenko
0 siblings, 0 replies; 2+ messages in thread
From: Andy Shevchenko @ 2021-03-04 15:53 UTC (permalink / raw)
To: Heikki Krogerus; +Cc: Greg Kroah-Hartman, Sudip Mukherjee, linux-serial
On Thu, Mar 04, 2021 at 11:13:11AM +0300, Heikki Krogerus wrote:
> Software node is always created for additional device
> properties. If the properties are constant, the software
> node can also be constant.
Independently on the below nit-picks
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Signed-off-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
> ---
> drivers/tty/serial/8250/8250_exar.c | 17 +++++++++++++----
> 1 file changed, 13 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/tty/serial/8250/8250_exar.c b/drivers/tty/serial/8250/8250_exar.c
> index 2d0e7c7e408dc..2f49c580139b8 100644
> --- a/drivers/tty/serial/8250/8250_exar.c
> +++ b/drivers/tty/serial/8250/8250_exar.c
> @@ -354,7 +354,7 @@ static void setup_gpio(struct pci_dev *pcidev, u8 __iomem *p)
>
> static void *
> __xr17v35x_register_gpio(struct pci_dev *pcidev,
> - const struct property_entry *properties)
> + const struct software_node *node)
> {
> struct platform_device *pdev;
>
> @@ -365,7 +365,7 @@ __xr17v35x_register_gpio(struct pci_dev *pcidev,
> pdev->dev.parent = &pcidev->dev;
> ACPI_COMPANION_SET(&pdev->dev, ACPI_COMPANION(&pcidev->dev));
>
> - if (platform_device_add_properties(pdev, properties) < 0 ||
> + if (device_add_software_node(&pdev->dev, node) < 0 ||
> platform_device_add(pdev) < 0) {
> platform_device_put(pdev);
> return NULL;
> @@ -380,12 +380,16 @@ static const struct property_entry exar_gpio_properties[] = {
> { }
> };
>
> +static const struct software_node exar_gpio_node = {
> + .properties = exar_gpio_properties,
> +};
> +
> static int xr17v35x_register_gpio(struct pci_dev *pcidev,
> struct uart_8250_port *port)
> {
> if (pcidev->vendor == PCI_VENDOR_ID_EXAR)
> port->port.private_data =
> - __xr17v35x_register_gpio(pcidev, exar_gpio_properties);
> + __xr17v35x_register_gpio(pcidev, &exar_gpio_node);
I would do one line.
> return 0;
> }
> @@ -457,6 +461,10 @@ static const struct property_entry iot2040_gpio_properties[] = {
> { }
> };
>
> +static const struct software_node iot2040_gpio_node = {
> + .properties = iot2040_gpio_properties,
> +};
> +
> static int iot2040_register_gpio(struct pci_dev *pcidev,
> struct uart_8250_port *port)
> {
> @@ -468,7 +476,7 @@ static int iot2040_register_gpio(struct pci_dev *pcidev,
> writeb(IOT2040_UARTS_GPIO_HI_MODE, p + UART_EXAR_MPIOSEL_15_8);
> port->port.private_data =
> - __xr17v35x_register_gpio(pcidev, iot2040_gpio_properties);
> + __xr17v35x_register_gpio(pcidev, &iot2040_gpio_node);
Ditto.
> return 0;
> }
> @@ -547,6 +555,7 @@ static void pci_xr17v35x_exit(struct pci_dev *pcidev)
> struct uart_8250_port *port = serial8250_get_port(priv->line[0]);
> struct platform_device *pdev = port->port.private_data;
>
> + device_remove_software_node(&pdev->dev);
> platform_device_unregister(pdev);
> port->port.private_data = NULL;
> }
> --
> 2.30.1
>
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-04 15:55 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-04 8:13 [PATCH] serial: 8250_exar: Constify the software nodes Heikki Krogerus
2021-03-04 15:53 ` Andy Shevchenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.