Skip to contentSkip to conversation

drm/nouveau: Remove duplicate ACPI_VIDEO_NOTIFY_PROBE definition

PATCH In review Bjorn Helgaas 2 participants 2 messages Apr 4, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/nouveau: Remove duplicate ACPI_VIDEO_NOTIFY_PROBE definition

From: Bjorn Helgaas <[email protected]>

Commit 3a6536c51d5d ("drm/nouveau: Intercept ACPI_VIDEO_NOTIFY_PROBE") added a definition of ACPI_VIDEO_NOTIFY_PROBE because <acpi/video.h> didn't supply one. Later, commit eff4a751cce5 ("ACPI / video: Move ACPI_VIDEO_NOTIFY_* defines to acpi/video.h") moved ACPI_VIDEO_NOTIFY_PROBE and other definitions to <acpi/video.h>, so the copy in nouveau_display.c is now unnecessary.

Remove the unnecessary definition from nouveau_display.c.

---
 drivers/gpu/drm/nouveau/nouveau_display.c | 9 ---------
 1 file changed, 9 deletions(-)
drivers/gpu/drm/nouveau/nouveau_display.c +0 -9
index 55c0fa451163..832da8e0020d 100644
@@ -358,15 +358,6 @@ nouveau_display_hpd_work(struct work_struct *work)
 
 #ifdef CONFIG_ACPI
 
-/*
- * Hans de Goede: This define belongs in acpi/video.h, I've submitted a patch
- * to the acpi subsys to move it there from drivers/acpi/acpi_video.c .
- * This should be dropped once that is merged.
- */
-#ifndef ACPI_VIDEO_NOTIFY_PROBE
-#define ACPI_VIDEO_NOTIFY_PROBE			0x81
-#endif
-
 static int
 nouveau_display_acpi_ntfy(struct notifier_block *nb, unsigned long val,
 			  void *data)
Signature · 1 line
2.21.0.392.gf8f6787159e-goog
Acked-by on v1 1/1
#1 lore raw

Hi,

Quoted 9 lines · Bjorn Helgaas

From: Bjorn Helgaas <[email protected]>

Commit 3a6536c51d5d ("drm/nouveau: Intercept ACPI_VIDEO_NOTIFY_PROBE") added a definition of ACPI_VIDEO_NOTIFY_PROBE because <acpi/video.h> didn't supply one. Later, commit eff4a751cce5 ("ACPI / video: Move ACPI_VIDEO_NOTIFY_* defines to acpi/video.h") moved ACPI_VIDEO_NOTIFY_PROBE and other definitions to <acpi/video.h>, so the copy in nouveau_display.c is now unnecessary.

Quoted 4 lines

Remove the unnecessary definition from nouveau_display.c.

Thank you for cleaning this up:

Regards,

Hans

Quoted 25 lines
---
  drivers/gpu/drm/nouveau/nouveau_display.c | 9 ---------
  1 file changed, 9 deletions(-)
drivers/gpu/drm/nouveau/nouveau_display.c +0 -9
index 55c0fa451163..832da8e0020d 100644
@@ -358,15 +358,6 @@ nouveau_display_hpd_work(struct work_struct *work)
 
  #ifdef CONFIG_ACPI
 
-/*
- * Hans de Goede: This define belongs in acpi/video.h, I've submitted a patch
- * to the acpi subsys to move it there from drivers/acpi/acpi_video.c .
- * This should be dropped once that is merged.
- */
-#ifndef ACPI_VIDEO_NOTIFY_PROBE
-#define ACPI_VIDEO_NOTIFY_PROBE			0x81
-#endif
-
  static int
  nouveau_display_acpi_ntfy(struct notifier_block *nb, unsigned long val,
  			  void *data)