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

Commit 9cccc76b authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: keep declarations in i915_drv.h 



Fix sparse warnings:

drivers/gpu/drm/i915/i915_drv.c:1179:5: warning: symbol
'i915_driver_load' was not declared. Should it be static?

drivers/gpu/drm/i915/i915_drv.c:1267:6: warning: symbol
'i915_driver_unload' was not declared. Should it be static?

drivers/gpu/drm/i915/i915_drv.c:2444:25: warning: symbol 'i915_pm_ops'
was not declared. Should it be static?

Fixes: 42f5551d ("drm/i915: Split out the PCI driver interface to i915_pci.c")
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1473946137-1931-3-git-send-email-jani.nikula@intel.com


(cherry picked from commit efab0698)
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 07d9a380

drivers/gpu/drm/i915/i915_drv.h

+5 −0
Original line number Diff line number Diff line
@@ -2883,6 +2883,11 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level, 
extern long i915_compat_ioctl(struct file *filp, unsigned int cmd,

			      unsigned long arg);

#endif

extern const struct dev_pm_ops i915_pm_ops;



extern int i915_driver_load(struct pci_dev *pdev,

			    const struct pci_device_id *ent);

extern void i915_driver_unload(struct drm_device *dev);

extern int intel_gpu_reset(struct drm_i915_private *dev_priv, u32 engine_mask);

extern bool intel_has_gpu_reset(struct drm_i915_private *dev_priv);

extern void i915_reset(struct drm_i915_private *dev_priv);

drivers/gpu/drm/i915/i915_pci.c

+0 −7
Original line number Diff line number Diff line
@@ -431,9 +431,6 @@ static const struct pci_device_id pciidlist[] = { 
};

MODULE_DEVICE_TABLE(pci, pciidlist);



extern int i915_driver_load(struct pci_dev *pdev,

			    const struct pci_device_id *ent);



static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)

{

	struct intel_device_info *intel_info =
@@ -463,8 +460,6 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	return i915_driver_load(pdev, ent);

}



extern void i915_driver_unload(struct drm_device *dev);



static void i915_pci_remove(struct pci_dev *pdev)

{

	struct drm_device *dev = pci_get_drvdata(pdev);
@@ -473,8 +468,6 @@ static void i915_pci_remove(struct pci_dev *pdev) 
	drm_dev_unref(dev);

}



extern const struct dev_pm_ops i915_pm_ops;



static struct pci_driver i915_pci_driver = {

	.name = DRIVER_NAME,

	.id_table = pciidlist,