From 506bc8e2ff34565e5c50940d0ef3addb93b07faa Mon Sep 17 00:00:00 2001 From: Nico Huber Date: Fri, 30 Jun 2017 16:59:42 +0200 Subject: [PATCH] device/smbus: Drop some never used boilerplate It was added with the words "Update the device header files" and we maintained it for nearly 13 years :) These functions are part of the SMBus spec but they are rarely used and keeping them just in case increases the maintenance burden. Change-Id: I69a1ea155a21463fc09b7b2c5b7302515a0030b2 Signed-off-by: Nico Huber Reviewed-on: https://review.coreboot.org/20439 Tested-by: build bot (Jenkins) Reviewed-by: Werner Zeh Reviewed-by: Aaron Durbin Reviewed-by: Paul Menzel --- src/device/smbus_ops.c | 35 ----------------------------------- src/include/device/smbus.h | 10 ---------- 2 files changed, 45 deletions(-) diff --git a/src/device/smbus_ops.c b/src/device/smbus_ops.c index 0cfb34fca7..4072402555 100644 --- a/src/device/smbus_ops.c +++ b/src/device/smbus_ops.c @@ -92,20 +92,6 @@ int smbus_set_link(device_t dev) } -int smbus_quick_read(device_t dev) -{ - CHECK_PRESENCE(quick_read); - - return ops_smbus_bus(get_pbus_smbus(dev))->quick_read(dev); -} - -int smbus_quick_write(device_t dev) -{ - CHECK_PRESENCE(quick_write); - - return ops_smbus_bus(get_pbus_smbus(dev))->quick_write(dev); -} - int smbus_recv_byte(device_t dev) { CHECK_PRESENCE(recv_byte); @@ -134,27 +120,6 @@ int smbus_write_byte(device_t dev, u8 addr, u8 val) return ops_smbus_bus(get_pbus_smbus(dev))->write_byte(dev, addr, val); } -int smbus_read_word(device_t dev, u8 addr) -{ - CHECK_PRESENCE(read_word); - - return ops_smbus_bus(get_pbus_smbus(dev))->read_word(dev, addr); -} - -int smbus_write_word(device_t dev, u8 addr, u16 val) -{ - CHECK_PRESENCE(write_word); - - return ops_smbus_bus(get_pbus_smbus(dev))->write_word(dev, addr, val); -} - -int smbus_process_call(device_t dev, u8 cmd, u16 data) -{ - CHECK_PRESENCE(process_call); - - return ops_smbus_bus(get_pbus_smbus(dev))->process_call(dev, cmd, data); -} - int smbus_block_read(device_t dev, u8 cmd, u8 bytes, u8 *buffer) { CHECK_PRESENCE(block_read); diff --git a/src/include/device/smbus.h b/src/include/device/smbus.h index 820dac377b..80eafdb969 100644 --- a/src/include/device/smbus.h +++ b/src/include/device/smbus.h @@ -8,15 +8,10 @@ /* Common SMBus bus operations */ struct smbus_bus_operations { - int (*quick_read)(device_t dev); - int (*quick_write)(device_t dev); int (*recv_byte)(device_t dev); int (*send_byte)(device_t dev, u8 value); int (*read_byte)(device_t dev, u8 addr); int (*write_byte)(device_t dev, u8 addr, u8 value); - int (*read_word)(device_t dev, u8 addr); - int (*write_word)(device_t dev, u8 addr, u16 value); - int (*process_call)(device_t dev, u8 cmd, u16 data); int (*block_read)(device_t dev, u8 cmd, u8 bytes, u8 *buffer); int (*block_write)(device_t dev, u8 cmd, u8 bytes, const u8 *buffer); }; @@ -35,15 +30,10 @@ static inline const struct smbus_bus_operations *ops_smbus_bus(struct bus *bus) struct bus *get_pbus_smbus(device_t dev); int smbus_set_link(device_t dev); -int smbus_quick_read(device_t dev); -int smbus_quick_write(device_t dev); int smbus_recv_byte(device_t dev); int smbus_send_byte(device_t dev, u8 byte); int smbus_read_byte(device_t dev, u8 addr); int smbus_write_byte(device_t dev, u8 addr, u8 val); -int smbus_read_word(device_t dev, u8 addr); -int smbus_write_word(device_t dev, u8 addr, u16 val); -int smbus_process_call(device_t dev, u8 cmd, u16 data); int smbus_block_read(device_t dev, u8 cmd, u8 bytes, u8 *buffer); int smbus_block_write(device_t dev, u8 cmd, u8 bytes, const u8 *buffer);