Commit 10d43ecb authored by Dr. David Alan Gilbert's avatar Dr. David Alan Gilbert Committed by Greg Kroah-Hartman
Browse files

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 32e2b59f ("mei: txe: add hw-txe.c")

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

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

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

Remove them.

Signed-off-by: default avatarDr. David Alan Gilbert <linux@treblig.org>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarAlexander Usyskin <alexander.usyskin@intel.com>
Link: https://lore.kernel.org/r/20250130012654.255119-1-linux@treblig.org


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

drivers/misc/mei/bus.c

+0 −52
Original line number Diff line number Diff line
@@ -323,28 +323,6 @@ ssize_t mei_cldev_recv_vtag(struct mei_cl_device *cldev, u8 *buf, size_t length, 
}

EXPORT_SYMBOL_GPL(mei_cldev_recv_vtag);



/**

 * mei_cldev_recv_nonblock_vtag - non block client receive with vtag (read)

 *

 * @cldev: me client device

 * @buf: buffer to receive

 * @length: buffer length

 * @vtag: virtual tag

 *

 * Return:

 * * read size in bytes

 * * -EAGAIN if function will block.

 * * < 0 on other error

 */

ssize_t mei_cldev_recv_nonblock_vtag(struct mei_cl_device *cldev, u8 *buf,

				     size_t length, u8 *vtag)

{

	struct mei_cl *cl = cldev->cl;



	return __mei_cl_recv(cl, buf, length, vtag, MEI_CL_IO_RX_NONBLOCK, 0);

}

EXPORT_SYMBOL_GPL(mei_cldev_recv_nonblock_vtag);



/**

 * mei_cldev_recv_timeout - client receive with timeout (read)

 *
@@ -438,23 +416,6 @@ ssize_t mei_cldev_recv(struct mei_cl_device *cldev, u8 *buf, size_t length) 
}

EXPORT_SYMBOL_GPL(mei_cldev_recv);



/**

 * mei_cldev_recv_nonblock - non block client receive (read)

 *

 * @cldev: me client device

 * @buf: buffer to receive

 * @length: buffer length

 *

 * Return: read size in bytes of < 0 on error

 *         -EAGAIN if function will block.

 */

ssize_t mei_cldev_recv_nonblock(struct mei_cl_device *cldev, u8 *buf,

				size_t length)

{

	return mei_cldev_recv_nonblock_vtag(cldev, buf, length, NULL);

}

EXPORT_SYMBOL_GPL(mei_cldev_recv_nonblock);



/**

 * mei_cl_bus_rx_work - dispatch rx event for a bus device

 *
@@ -640,19 +601,6 @@ void mei_cldev_set_drvdata(struct mei_cl_device *cldev, void *data) 
}

EXPORT_SYMBOL_GPL(mei_cldev_set_drvdata);



/**

 * mei_cldev_uuid - return uuid of the underlying me client

 *

 * @cldev: mei client device

 *

 * Return: me client uuid

 */

const uuid_le *mei_cldev_uuid(const struct mei_cl_device *cldev)

{

	return mei_me_cl_uuid(cldev->me_cl);

}

EXPORT_SYMBOL_GPL(mei_cldev_uuid);



/**

 * mei_cldev_ver - return protocol version of the underlying me client

 *

drivers/misc/mei/client.c

+0 −22
Original line number Diff line number Diff line
@@ -271,28 +271,6 @@ void mei_me_cl_rm_by_uuid(struct mei_device *dev, const uuid_le *uuid) 
	up_write(&dev->me_clients_rwsem);

}



/**

 * mei_me_cl_rm_by_uuid_id - remove all me clients matching client id

 *

 * @dev: the device structure

 * @uuid: me client uuid

 * @id: me client id

 *

 * Locking: called under "dev->device_lock" lock

 */

void mei_me_cl_rm_by_uuid_id(struct mei_device *dev, const uuid_le *uuid, u8 id)

{

	struct mei_me_client *me_cl;



	dev_dbg(dev->dev, "remove %pUl %d\n", uuid, id);



	down_write(&dev->me_clients_rwsem);

	me_cl = __mei_me_cl_by_uuid_id(dev, uuid, id);

	__mei_me_cl_del(dev, me_cl);

	mei_me_cl_put(me_cl);

	up_write(&dev->me_clients_rwsem);

}



/**

 * mei_me_cl_rm_all - remove all me clients

 *

drivers/misc/mei/client.h

+0 −2
Original line number Diff line number Diff line
@@ -29,8 +29,6 @@ struct mei_me_client *mei_me_cl_by_id(struct mei_device *dev, u8 client_id); 
struct mei_me_client *mei_me_cl_by_uuid_id(struct mei_device *dev,

					   const uuid_le *uuid, u8 client_id);

void mei_me_cl_rm_by_uuid(struct mei_device *dev, const uuid_le *uuid);

void mei_me_cl_rm_by_uuid_id(struct mei_device *dev,

			     const uuid_le *uuid, u8 id);

void mei_me_cl_rm_all(struct mei_device *dev);



/**

drivers/misc/mei/hw-txe.c

+0 −45
Original line number Diff line number Diff line
@@ -1209,48 +1209,3 @@ struct mei_device *mei_txe_dev_init(struct pci_dev *pdev) 


	return dev;

}
 


/**

 * mei_txe_setup_satt2 - SATT2 configuration for DMA support.

 *

 * @dev:   the device structure

 * @addr:  physical address start of the range

 * @range: physical range size

 *

 * Return: 0 on success an error code otherwise

 */

int mei_txe_setup_satt2(struct mei_device *dev, phys_addr_t addr, u32 range)

{

	struct mei_txe_hw *hw = to_txe_hw(dev);



	u32 lo32 = lower_32_bits(addr);

	u32 hi32 = upper_32_bits(addr);

	u32 ctrl;



	/* SATT is limited to 36 Bits */

	if (hi32 & ~0xF)

		return -EINVAL;



	/* SATT has to be 16Byte aligned */

	if (lo32 & 0xF)

		return -EINVAL;



	/* SATT range has to be 4Bytes aligned */

	if (range & 0x4)

		return -EINVAL;



	/* SATT is limited to 32 MB range*/

	if (range > SATT_RANGE_MAX)

		return -EINVAL;



	ctrl = SATT2_CTRL_VALID_MSK;

	ctrl |= hi32  << SATT2_CTRL_BR_BASE_ADDR_REG_SHIFT;



	mei_txe_br_reg_write(hw, SATT2_SAP_SIZE_REG, range);

	mei_txe_br_reg_write(hw, SATT2_BRG_BA_LSB_REG, lo32);

	mei_txe_br_reg_write(hw, SATT2_CTRL_REG, ctrl);

	dev_dbg(dev->dev, "SATT2: SAP_SIZE_OFFSET=0x%08X, BRG_BA_LSB_OFFSET=0x%08X, CTRL_OFFSET=0x%08X\n",

		range, lo32, ctrl);



	return 0;

}

drivers/misc/mei/hw-txe.h

+0 −2
Original line number Diff line number Diff line
@@ -59,7 +59,5 @@ irqreturn_t mei_txe_irq_thread_handler(int irq, void *dev_id); 


int mei_txe_aliveness_set_sync(struct mei_device *dev, u32 req);



int mei_txe_setup_satt2(struct mei_device *dev, phys_addr_t addr, u32 range);





#endif /* _MEI_HW_TXE_H_ */