Commit c2f17e60 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/gma500: Embed struct drm_device in struct drm_psb_private 



Embed struct drm_device in struct drm_psb_private. Replace the use
of dev_private by an upcast operation. Switch to managed release of
struct drm_psb_private.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarPatrik Jakobsson <patrik.r.jakobsson@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210920141051.30988-4-tzimmermann@suse.de
parent 2df94510

drivers/gpu/drm/gma500/cdv_device.c

+1 −1
Original line number Diff line number Diff line
@@ -429,7 +429,7 @@ static void cdv_hotplug_work_func(struct work_struct *work) 
{

        struct drm_psb_private *dev_priv = container_of(work, struct drm_psb_private,

							hotplug_work);

        struct drm_device *dev = dev_priv->dev;

	struct drm_device *dev = &dev_priv->dev;



        /* Just fire off a uevent and let userspace tell us what to do */

        drm_helper_hpd_irq_event(dev);

drivers/gpu/drm/gma500/intel_bios.c

+3 −3
Original line number Diff line number Diff line
@@ -207,7 +207,7 @@ static void parse_backlight_data(struct drm_psb_private *dev_priv, 


	lvds_bl = kmemdup(vbt_lvds_bl, sizeof(*vbt_lvds_bl), GFP_KERNEL);

	if (!lvds_bl) {

		dev_err(dev_priv->dev->dev, "out of memory for backlight data\n");

		dev_err(dev_priv->dev.dev, "out of memory for backlight data\n");

		return;

	}

	dev_priv->lvds_bl = lvds_bl;
@@ -248,7 +248,7 @@ static void parse_lfp_panel_data(struct drm_psb_private *dev_priv, 
	panel_fixed_mode = kzalloc(sizeof(*panel_fixed_mode),

				      GFP_KERNEL);

	if (panel_fixed_mode == NULL) {

		dev_err(dev_priv->dev->dev, "out of memory for fixed panel mode\n");

		dev_err(dev_priv->dev.dev, "out of memory for fixed panel mode\n");

		return;

	}
@@ -259,7 +259,7 @@ static void parse_lfp_panel_data(struct drm_psb_private *dev_priv, 
		dev_priv->lfp_lvds_vbt_mode = panel_fixed_mode;

		drm_mode_debug_printmodeline(panel_fixed_mode);

	} else {

		dev_dbg(dev_priv->dev->dev, "ignoring invalid LVDS VBT\n");

		dev_dbg(dev_priv->dev.dev, "ignoring invalid LVDS VBT\n");

		dev_priv->lvds_vbt = 0;

		kfree(panel_fixed_mode);

	}

drivers/gpu/drm/gma500/intel_gmbus.c

+3 −3
Original line number Diff line number Diff line
@@ -196,7 +196,7 @@ intel_gpio_create(struct drm_psb_private *dev_priv, u32 pin) 
		 "gma500 GPIO%c", "?BACDE?F"[pin]);

	gpio->adapter.owner = THIS_MODULE;

	gpio->adapter.algo_data	= &gpio->algo;

	gpio->adapter.dev.parent = dev_priv->dev->dev;

	gpio->adapter.dev.parent = dev_priv->dev.dev;

	gpio->algo.setsda = set_data;

	gpio->algo.setscl = set_clock;

	gpio->algo.getsda = get_data;
@@ -226,7 +226,7 @@ intel_i2c_quirk_xfer(struct drm_psb_private *dev_priv, 
					       adapter);

	int ret;



	gma_intel_i2c_reset(dev_priv->dev);

	gma_intel_i2c_reset(&dev_priv->dev);



	intel_i2c_quirk_set(dev_priv, true);

	set_data(gpio, 1);
@@ -432,7 +432,7 @@ int gma_intel_setup_gmbus(struct drm_device *dev) 
		bus->force_bit = intel_gpio_create(dev_priv, i);

	}



	gma_intel_i2c_reset(dev_priv->dev);

	gma_intel_i2c_reset(&dev_priv->dev);



	return 0;

drivers/gpu/drm/gma500/mid_bios.c

+3 −4
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ static void mid_get_fuse_settings(struct drm_device *dev) 
static void mid_get_pci_revID(struct drm_psb_private *dev_priv)

{

	uint32_t platform_rev_id = 0;

	struct pci_dev *pdev = to_pci_dev(dev_priv->dev->dev);

	struct pci_dev *pdev = to_pci_dev(dev_priv->dev.dev);

	int domain = pci_domain_nr(pdev->bus);

	struct pci_dev *pci_gfx_root =

		pci_get_domain_bus_and_slot(domain, 0, PCI_DEVFN(2, 0));
@@ -106,8 +106,7 @@ static void mid_get_pci_revID(struct drm_psb_private *dev_priv) 
	pci_read_config_dword(pci_gfx_root, 0x08, &platform_rev_id);

	dev_priv->platform_rev_id = (uint8_t) platform_rev_id;

	pci_dev_put(pci_gfx_root);

	dev_dbg(dev_priv->dev->dev, "platform_rev_id is %x\n",

					dev_priv->platform_rev_id);

	dev_dbg(dev_priv->dev.dev, "platform_rev_id is %x\n", dev_priv->platform_rev_id);

}



struct mid_vbt_header {
@@ -270,7 +269,7 @@ static int mid_get_vbt_data_r10(struct drm_psb_private *dev_priv, u32 addr) 


static void mid_get_vbt_data(struct drm_psb_private *dev_priv)

{

	struct drm_device *dev = dev_priv->dev;

	struct drm_device *dev = &dev_priv->dev;

	struct pci_dev *pdev = to_pci_dev(dev->dev);

	u32 addr;

	u8 __iomem *vbt_virtual;

drivers/gpu/drm/gma500/opregion.c

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static void psb_intel_opregion_asle_work(struct work_struct *work) 
	}



	if (asle_req & ASLE_SET_BACKLIGHT)

		asle_stat |= asle_set_backlight(dev_priv->dev, asle->bclp);

		asle_stat |= asle_set_backlight(&dev_priv->dev, asle->bclp);



	asle->aslc = asle_stat;