Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6aa57f16 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

serial: sh-sci: use driver core functions, not sysfs ones. 

This is a driver, do not call "raw" sysfs functions, instead call driver
core ones.  Specifically convert the use of sysfs_create_file() and
sysfs_remove_file() to use device_create_file() and device_remove_file()

Cc: Jiri Slaby <jslaby@suse.com>
Cc: linux-serial@vger.kernel.org
Link: https://lore.kernel.org/r/20190704084617.3602-4-gregkh@linuxfoundation.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 2bf593f1

drivers/tty/serial/sh-sci.c

+8 −14
Original line number Diff line number Diff line
@@ -3152,14 +3152,10 @@ static int sci_remove(struct platform_device *dev) 


	sci_cleanup_single(port);



	if (port->port.fifosize > 1) {

		sysfs_remove_file(&dev->dev.kobj,

				  &dev_attr_rx_fifo_trigger.attr);

	}

	if (type == PORT_SCIFA || type == PORT_SCIFB || type == PORT_HSCIF) {

		sysfs_remove_file(&dev->dev.kobj,

				  &dev_attr_rx_fifo_timeout.attr);

	}

	if (port->port.fifosize > 1)

		device_remove_file(&dev->dev, &dev_attr_rx_fifo_trigger);

	if (type == PORT_SCIFA || type == PORT_SCIFB || type == PORT_HSCIF)

		device_remove_file(&dev->dev, &dev_attr_rx_fifo_timeout);



	return 0;

}
@@ -3347,19 +3343,17 @@ static int sci_probe(struct platform_device *dev) 
		return ret;



	if (sp->port.fifosize > 1) {

		ret = sysfs_create_file(&dev->dev.kobj,

				&dev_attr_rx_fifo_trigger.attr);

		ret = device_create_file(&dev->dev, &dev_attr_rx_fifo_trigger);

		if (ret)

			return ret;

	}

	if (sp->port.type == PORT_SCIFA || sp->port.type == PORT_SCIFB ||

	    sp->port.type == PORT_HSCIF) {

		ret = sysfs_create_file(&dev->dev.kobj,

				&dev_attr_rx_fifo_timeout.attr);

		ret = device_create_file(&dev->dev, &dev_attr_rx_fifo_timeout);

		if (ret) {

			if (sp->port.fifosize > 1) {

				sysfs_remove_file(&dev->dev.kobj,

					&dev_attr_rx_fifo_trigger.attr);

				device_remove_file(&dev->dev,

						   &dev_attr_rx_fifo_trigger);

			}

			return ret;

		}