Skip to content

Commit 5af8903

Browse files
Jiri Slaby (SUSE)gregkh
authored andcommitted
tty: serdev: drop serdev_controller_ops::write_room()
In particular, serdev_device_write_room() is not called, so the whole serdev's write_room() can go. Signed-off-by: Jiri Slaby (SUSE) <[email protected]> Cc: Rob Herring <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 5244355 commit 5af8903

File tree

3 files changed

+0
-26
lines changed

3 files changed

+0
-26
lines changed

drivers/tty/serdev/core.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -316,17 +316,6 @@ void serdev_device_write_flush(struct serdev_device *serdev)
316316
}
317317
EXPORT_SYMBOL_GPL(serdev_device_write_flush);
318318

319-
int serdev_device_write_room(struct serdev_device *serdev)
320-
{
321-
struct serdev_controller *ctrl = serdev->ctrl;
322-
323-
if (!ctrl || !ctrl->ops->write_room)
324-
return 0;
325-
326-
return serdev->ctrl->ops->write_room(ctrl);
327-
}
328-
EXPORT_SYMBOL_GPL(serdev_device_write_room);
329-
330319
unsigned int serdev_device_set_baudrate(struct serdev_device *serdev, unsigned int speed)
331320
{
332321
struct serdev_controller *ctrl = serdev->ctrl;

drivers/tty/serdev/serdev-ttyport.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -92,14 +92,6 @@ static void ttyport_write_flush(struct serdev_controller *ctrl)
9292
tty_driver_flush_buffer(tty);
9393
}
9494

95-
static int ttyport_write_room(struct serdev_controller *ctrl)
96-
{
97-
struct serport *serport = serdev_controller_get_drvdata(ctrl);
98-
struct tty_struct *tty = serport->tty;
99-
100-
return tty_write_room(tty);
101-
}
102-
10395
static int ttyport_open(struct serdev_controller *ctrl)
10496
{
10597
struct serport *serport = serdev_controller_get_drvdata(ctrl);
@@ -259,7 +251,6 @@ static int ttyport_break_ctl(struct serdev_controller *ctrl, unsigned int break_
259251
static const struct serdev_controller_ops ctrl_ops = {
260252
.write_buf = ttyport_write_buf,
261253
.write_flush = ttyport_write_flush,
262-
.write_room = ttyport_write_room,
263254
.open = ttyport_open,
264255
.close = ttyport_close,
265256
.set_flow_control = ttyport_set_flow_control,

include/linux/serdev.h

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ enum serdev_parity {
8484
struct serdev_controller_ops {
8585
ssize_t (*write_buf)(struct serdev_controller *, const u8 *, size_t);
8686
void (*write_flush)(struct serdev_controller *);
87-
int (*write_room)(struct serdev_controller *);
8887
int (*open)(struct serdev_controller *);
8988
void (*close)(struct serdev_controller *);
9089
void (*set_flow_control)(struct serdev_controller *, bool);
@@ -212,7 +211,6 @@ int serdev_device_break_ctl(struct serdev_device *serdev, int break_state);
212211
void serdev_device_write_wakeup(struct serdev_device *);
213212
ssize_t serdev_device_write(struct serdev_device *, const u8 *, size_t, long);
214213
void serdev_device_write_flush(struct serdev_device *);
215-
int serdev_device_write_room(struct serdev_device *);
216214

217215
/*
218216
* serdev device driver functions
@@ -273,10 +271,6 @@ static inline ssize_t serdev_device_write(struct serdev_device *sdev,
273271
return -ENODEV;
274272
}
275273
static inline void serdev_device_write_flush(struct serdev_device *sdev) {}
276-
static inline int serdev_device_write_room(struct serdev_device *sdev)
277-
{
278-
return 0;
279-
}
280274

281275
#define serdev_device_driver_register(x)
282276
#define serdev_device_driver_unregister(x)

0 commit comments

Comments
 (0)