Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ce97b1b6 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Revert "drm/mipi-dsi: Fix detach call without attach" 



This reverts commit 67997250 which is
commit 90d50b8d85834e73536fdccd5aa913b30494fef0 upstream.

It breaks the Android kernel abi and can be brought back in the future
in an abi-safe way if it is really needed.

Bug: 161946584
Change-Id: Ib35a1ec2def2ed5bc40a2dd58a7c2fa981477538
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent 806fb883

drivers/gpu/drm/drm_mipi_dsi.c

+2 −15
Original line number Diff line number Diff line
@@ -300,7 +300,6 @@ static int mipi_dsi_remove_device_fn(struct device *dev, void *priv) 
{

	struct mipi_dsi_device *dsi = to_mipi_dsi_device(dev);



	if (dsi->attached)

	mipi_dsi_detach(dsi);

	mipi_dsi_device_unregister(dsi);
@@ -324,18 +323,11 @@ EXPORT_SYMBOL(mipi_dsi_host_unregister); 
int mipi_dsi_attach(struct mipi_dsi_device *dsi)

{

	const struct mipi_dsi_host_ops *ops = dsi->host->ops;

	int ret;



	if (!ops || !ops->attach)

		return -ENOSYS;



	ret = ops->attach(dsi->host, dsi);

	if (ret)

		return ret;



	dsi->attached = true;



	return 0;

	return ops->attach(dsi->host, dsi);

}

EXPORT_SYMBOL(mipi_dsi_attach);
@@ -347,14 +339,9 @@ int mipi_dsi_detach(struct mipi_dsi_device *dsi) 
{

	const struct mipi_dsi_host_ops *ops = dsi->host->ops;



	if (WARN_ON(!dsi->attached))

		return -EINVAL;



	if (!ops || !ops->detach)

		return -ENOSYS;



	dsi->attached = false;



	return ops->detach(dsi->host, dsi);

}

EXPORT_SYMBOL(mipi_dsi_detach);

include/drm/drm_mipi_dsi.h

+0 −2
Original line number Diff line number Diff line
@@ -172,7 +172,6 @@ struct mipi_dsi_device_info { 
 * struct mipi_dsi_device - DSI peripheral device

 * @host: DSI host for this peripheral

 * @dev: driver model device node for this peripheral

 * @attached: the DSI device has been successfully attached

 * @name: DSI peripheral chip type

 * @channel: virtual channel assigned to the peripheral

 * @format: pixel format for video mode
@@ -188,7 +187,6 @@ struct mipi_dsi_device_info { 
struct mipi_dsi_device {

	struct mipi_dsi_host *host;

	struct device dev;

	bool attached;



	char name[DSI_DEV_NAME_SIZE];

	unsigned int channel;