mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-07-16 17:57:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Revert "serdev: BREAK/FRAME/PARITY/OVERRUN notification prototype V2"

Browse Source 
This reverts commit d8e9a406a9.

It needs some future changes as pointed out by Johan and is not ready to
be merged just yet.

Reported-by: Johan Hovold <johan@kernel.org>
Cc: Magnus Damm <damm+renesas@opensource.se>
Link: https://lore.kernel.org/r/Yc7oZ/1tu95Z4wPS@hovoldconsulting.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman
2021-12-31 13:42:30 +01:00
parent 5acb78dc72
commit 99a507a8ea
3 changed files with 0 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/tty/serdev/core.c
View File

@@ -349,17 +349,6 @@ unsigned int serdev_device_set_baudrate(struct serdev_device *serdev, unsigned i
}
EXPORT_SYMBOL_GPL(serdev_device_set_baudrate);
void serdev_device_set_error_mask(struct serdev_device *serdev, unsigned long mask)
{
struct serdev_controller *ctrl = serdev->ctrl;
if (!ctrl || !ctrl->ops->set_error_mask)
return;
ctrl->ops->set_error_mask(ctrl, mask);
}
EXPORT_SYMBOL_GPL(serdev_device_set_error_mask);
void serdev_device_set_flow_control(struct serdev_device *serdev, bool enable)
{
struct serdev_controller *ctrl = serdev->ctrl;

49
drivers/tty/serdev/serdev-ttyport.c
View File

@@ -2,7 +2,6 @@
/*
* Copyright (C) 2016-2017 Linaro Ltd., Rob Herring <robh@kernel.org>
*/
#include <linux/bits.h>
#include <linux/kernel.h>
#include <linux/serdev.h>
#include <linux/tty.h>
@@ -10,10 +9,6 @@
#include <linux/poll.h>
#define SERPORT_ACTIVE 1
#define SERPORT_NOTIFY_BREAK 2
#define SERPORT_NOTIFY_FRAME 3
#define SERPORT_NOTIFY_PARITY 4
#define SERPORT_NOTIFY_OVERRUN 5
struct serport {
struct tty_port *port;
@@ -32,39 +27,11 @@ static int ttyport_receive_buf(struct tty_port *port, const unsigned char *cp,
{
struct serdev_controller *ctrl = port->client_data;
struct serport *serport = serdev_controller_get_drvdata(ctrl);
unsigned long errors = 0;
unsigned int i;
int ret;
if (!test_bit(SERPORT_ACTIVE, &serport->flags))
return 0;
for (i = 0; fp && i < count; i++) {
switch (fp[i]) {
case TTY_BREAK:
if (test_bit(SERPORT_NOTIFY_BREAK, &serport->flags))
__set_bit(SERDEV_ERROR_BREAK, &errors);
break;
case TTY_FRAME:
if (test_bit(SERPORT_NOTIFY_FRAME, &serport->flags))
__set_bit(SERDEV_ERROR_FRAME, &errors);
break;
case TTY_PARITY:
if (test_bit(SERPORT_NOTIFY_PARITY, &serport->flags))
__set_bit(SERDEV_ERROR_PARITY, &errors);
break;
case TTY_OVERRUN:
if (test_bit(SERPORT_NOTIFY_OVERRUN, &serport->flags))
__set_bit(SERDEV_ERROR_OVERRUN, &errors);
break;
}
}
if (errors)
serdev_controller_error(ctrl, errors);
ret = serdev_controller_receive_buf(ctrl, cp, count);
dev_WARN_ONCE(&ctrl->dev, ret < 0 || ret > count,
@@ -213,21 +180,6 @@ static unsigned int ttyport_set_baudrate(struct serdev_controller *ctrl, unsigne
return ktermios.c_ospeed;
}
static void ttyport_set_error_mask(struct serdev_controller *ctrl,
unsigned long m)
{
struct serport *sp = serdev_controller_get_drvdata(ctrl);
assign_bit(SERPORT_NOTIFY_BREAK, &sp->flags,
m & BIT(SERDEV_ERROR_BREAK));
assign_bit(SERPORT_NOTIFY_FRAME, &sp->flags,
m & BIT(SERDEV_ERROR_FRAME));
assign_bit(SERPORT_NOTIFY_PARITY, &sp->flags,
m & BIT(SERDEV_ERROR_PARITY));
assign_bit(SERPORT_NOTIFY_OVERRUN, &sp->flags,
m & BIT(SERDEV_ERROR_OVERRUN));
}
static void ttyport_set_flow_control(struct serdev_controller *ctrl, bool enable)
{
struct serport *serport = serdev_controller_get_drvdata(ctrl);
@@ -301,7 +253,6 @@ static const struct serdev_controller_ops ctrl_ops = {
.write_room = ttyport_write_room,
.open = ttyport_open,
.close = ttyport_close,
.set_error_mask = ttyport_set_error_mask,
.set_flow_control = ttyport_set_flow_control,
.set_parity = ttyport_set_parity,
.set_baudrate = ttyport_set_baudrate,