Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mei: Remove unused functions

The following functions have been in the mei code for
a long time but have never been used.

mei_txe_setup_satt2() was added in 2014 by
commit 32e2b59fca2c ("mei: txe: add hw-txe.c")

mei_me_cl_rm_by_uuid_id() was added in 2015 by
commit 79563db9ddd3 ("mei: add reference counting for me clients")

mei_cldev_uuid() was added in 2015 by
commit baeacd037697 ("mei: bus: export uuid and protocol version to mei_cl
bus drivers")

mei_cldev_recv_nonblock() was added in 2016 by
commit 076802d00615 ("mei: bus: enable non-blocking RX")
it is the only user of mei_cldev_recv_nonblock_vtag().

Remove them.

Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Alexander Usyskin <alexander.usyskin@intel.com>
Link: https://lore.kernel.org/r/20250130012654.255119-1-linux@treblig.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Dr. David Alan Gilbert and committed by
Greg Kroah-Hartman
10d43ecb 1a09cd9b

-128
-52
drivers/misc/mei/bus.c
··· 324 324 EXPORT_SYMBOL_GPL(mei_cldev_recv_vtag); 325 325 326 326 /** 327 - * mei_cldev_recv_nonblock_vtag - non block client receive with vtag (read) 328 - * 329 - * @cldev: me client device 330 - * @buf: buffer to receive 331 - * @length: buffer length 332 - * @vtag: virtual tag 333 - * 334 - * Return: 335 - * * read size in bytes 336 - * * -EAGAIN if function will block. 337 - * * < 0 on other error 338 - */ 339 - ssize_t mei_cldev_recv_nonblock_vtag(struct mei_cl_device *cldev, u8 *buf, 340 - size_t length, u8 *vtag) 341 - { 342 - struct mei_cl *cl = cldev->cl; 343 - 344 - return __mei_cl_recv(cl, buf, length, vtag, MEI_CL_IO_RX_NONBLOCK, 0); 345 - } 346 - EXPORT_SYMBOL_GPL(mei_cldev_recv_nonblock_vtag); 347 - 348 - /** 349 327 * mei_cldev_recv_timeout - client receive with timeout (read) 350 328 * 351 329 * @cldev: me client device ··· 415 437 return mei_cldev_recv_vtag(cldev, buf, length, NULL); 416 438 } 417 439 EXPORT_SYMBOL_GPL(mei_cldev_recv); 418 - 419 - /** 420 - * mei_cldev_recv_nonblock - non block client receive (read) 421 - * 422 - * @cldev: me client device 423 - * @buf: buffer to receive 424 - * @length: buffer length 425 - * 426 - * Return: read size in bytes of < 0 on error 427 - * -EAGAIN if function will block. 428 - */ 429 - ssize_t mei_cldev_recv_nonblock(struct mei_cl_device *cldev, u8 *buf, 430 - size_t length) 431 - { 432 - return mei_cldev_recv_nonblock_vtag(cldev, buf, length, NULL); 433 - } 434 - EXPORT_SYMBOL_GPL(mei_cldev_recv_nonblock); 435 440 436 441 /** 437 442 * mei_cl_bus_rx_work - dispatch rx event for a bus device ··· 600 639 dev_set_drvdata(&cldev->dev, data); 601 640 } 602 641 EXPORT_SYMBOL_GPL(mei_cldev_set_drvdata); 603 - 604 - /** 605 - * mei_cldev_uuid - return uuid of the underlying me client 606 - * 607 - * @cldev: mei client device 608 - * 609 - * Return: me client uuid 610 - */ 611 - const uuid_le *mei_cldev_uuid(const struct mei_cl_device *cldev) 612 - { 613 - return mei_me_cl_uuid(cldev->me_cl); 614 - } 615 - EXPORT_SYMBOL_GPL(mei_cldev_uuid); 616 642 617 643 /** 618 644 * mei_cldev_ver - return protocol version of the underlying me client
-22
drivers/misc/mei/client.c
··· 272 272 } 273 273 274 274 /** 275 - * mei_me_cl_rm_by_uuid_id - remove all me clients matching client id 276 - * 277 - * @dev: the device structure 278 - * @uuid: me client uuid 279 - * @id: me client id 280 - * 281 - * Locking: called under "dev->device_lock" lock 282 - */ 283 - void mei_me_cl_rm_by_uuid_id(struct mei_device *dev, const uuid_le *uuid, u8 id) 284 - { 285 - struct mei_me_client *me_cl; 286 - 287 - dev_dbg(dev->dev, "remove %pUl %d\n", uuid, id); 288 - 289 - down_write(&dev->me_clients_rwsem); 290 - me_cl = __mei_me_cl_by_uuid_id(dev, uuid, id); 291 - __mei_me_cl_del(dev, me_cl); 292 - mei_me_cl_put(me_cl); 293 - up_write(&dev->me_clients_rwsem); 294 - } 295 - 296 - /** 297 275 * mei_me_cl_rm_all - remove all me clients 298 276 * 299 277 * @dev: the device structure
-2
drivers/misc/mei/client.h
··· 29 29 struct mei_me_client *mei_me_cl_by_uuid_id(struct mei_device *dev, 30 30 const uuid_le *uuid, u8 client_id); 31 31 void mei_me_cl_rm_by_uuid(struct mei_device *dev, const uuid_le *uuid); 32 - void mei_me_cl_rm_by_uuid_id(struct mei_device *dev, 33 - const uuid_le *uuid, u8 id); 34 32 void mei_me_cl_rm_all(struct mei_device *dev); 35 33 36 34 /**
-45
drivers/misc/mei/hw-txe.c
··· 1209 1209 1210 1210 return dev; 1211 1211 } 1212 - 1213 - /** 1214 - * mei_txe_setup_satt2 - SATT2 configuration for DMA support. 1215 - * 1216 - * @dev: the device structure 1217 - * @addr: physical address start of the range 1218 - * @range: physical range size 1219 - * 1220 - * Return: 0 on success an error code otherwise 1221 - */ 1222 - int mei_txe_setup_satt2(struct mei_device *dev, phys_addr_t addr, u32 range) 1223 - { 1224 - struct mei_txe_hw *hw = to_txe_hw(dev); 1225 - 1226 - u32 lo32 = lower_32_bits(addr); 1227 - u32 hi32 = upper_32_bits(addr); 1228 - u32 ctrl; 1229 - 1230 - /* SATT is limited to 36 Bits */ 1231 - if (hi32 & ~0xF) 1232 - return -EINVAL; 1233 - 1234 - /* SATT has to be 16Byte aligned */ 1235 - if (lo32 & 0xF) 1236 - return -EINVAL; 1237 - 1238 - /* SATT range has to be 4Bytes aligned */ 1239 - if (range & 0x4) 1240 - return -EINVAL; 1241 - 1242 - /* SATT is limited to 32 MB range*/ 1243 - if (range > SATT_RANGE_MAX) 1244 - return -EINVAL; 1245 - 1246 - ctrl = SATT2_CTRL_VALID_MSK; 1247 - ctrl |= hi32 << SATT2_CTRL_BR_BASE_ADDR_REG_SHIFT; 1248 - 1249 - mei_txe_br_reg_write(hw, SATT2_SAP_SIZE_REG, range); 1250 - mei_txe_br_reg_write(hw, SATT2_BRG_BA_LSB_REG, lo32); 1251 - mei_txe_br_reg_write(hw, SATT2_CTRL_REG, ctrl); 1252 - dev_dbg(dev->dev, "SATT2: SAP_SIZE_OFFSET=0x%08X, BRG_BA_LSB_OFFSET=0x%08X, CTRL_OFFSET=0x%08X\n", 1253 - range, lo32, ctrl); 1254 - 1255 - return 0; 1256 - }
-2
drivers/misc/mei/hw-txe.h
··· 59 59 60 60 int mei_txe_aliveness_set_sync(struct mei_device *dev, u32 req); 61 61 62 - int mei_txe_setup_satt2(struct mei_device *dev, phys_addr_t addr, u32 range); 63 - 64 62 65 63 #endif /* _MEI_HW_TXE_H_ */
-5
include/linux/mei_cl_bus.h
··· 97 97 ssize_t mei_cldev_send_timeout(struct mei_cl_device *cldev, const u8 *buf, 98 98 size_t length, unsigned long timeout); 99 99 ssize_t mei_cldev_recv(struct mei_cl_device *cldev, u8 *buf, size_t length); 100 - ssize_t mei_cldev_recv_nonblock(struct mei_cl_device *cldev, u8 *buf, 101 - size_t length); 102 100 ssize_t mei_cldev_recv_timeout(struct mei_cl_device *cldev, u8 *buf, size_t length, 103 101 unsigned long timeout); 104 102 ssize_t mei_cldev_send_vtag(struct mei_cl_device *cldev, const u8 *buf, ··· 105 107 size_t length, u8 vtag, unsigned long timeout); 106 108 ssize_t mei_cldev_recv_vtag(struct mei_cl_device *cldev, u8 *buf, size_t length, 107 109 u8 *vtag); 108 - ssize_t mei_cldev_recv_nonblock_vtag(struct mei_cl_device *cldev, u8 *buf, 109 - size_t length, u8 *vtag); 110 110 ssize_t mei_cldev_recv_vtag_timeout(struct mei_cl_device *cldev, u8 *buf, size_t length, 111 111 u8 *vtag, unsigned long timeout); 112 112 ··· 112 116 int mei_cldev_register_notif_cb(struct mei_cl_device *cldev, 113 117 mei_cldev_cb_t notif_cb); 114 118 115 - const uuid_le *mei_cldev_uuid(const struct mei_cl_device *cldev); 116 119 u8 mei_cldev_ver(const struct mei_cl_device *cldev); 117 120 118 121 void *mei_cldev_get_drvdata(const struct mei_cl_device *cldev);