mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: ajoshi@shell.unixbox.com
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] avoid riva_get_EDID unused variable warnings
Date: Sat, 14 Aug 2004 16:28:28 +0200	[thread overview]
Message-ID: <20040814142828.GC25939@lst.de> (raw)

split the three versions of the function into separate blocks, makes
the code much cleaner aswell.


--- 1.62/drivers/video/riva/fbdev.c	2004-07-29 06:58:37 +02:00
+++ edited/drivers/video/riva/fbdev.c	2004-08-14 16:05:47 +02:00
@@ -1860,20 +1860,22 @@
 	var->accel_flags |= FB_ACCELF_TEXT;
 	NVTRACE_LEAVE();
 }
-
-
+#ifdef CONFIG_PPC_OF
 static void riva_get_EDID(struct fb_info *info, struct pci_dev *pdev)
 {
-	struct riva_par *par;
-	int i;
-
 	NVTRACE_ENTER();
-#ifdef CONFIG_PPC_OF
 	if (!riva_get_EDID_OF(info, pdev))
 		printk("rivafb: could not retrieve EDID from OF\n");
+	NVTRACE_LEAVE();
+}
 #else
-	/* XXX use other methods later */
 #ifdef CONFIG_FB_RIVA_I2C
+static void riva_get_EDID(struct fb_info *info, struct pci_dev *pdev)
+{
+	struct riva_par *par;
+	int i;
+
+	NVTRACE_ENTER();
 
 	par = (struct riva_par *) info->par;
 	riva_create_i2c_busses(par);
@@ -1885,11 +1887,14 @@
 		}
 	}
 	riva_delete_i2c_busses(par);
-#endif
-#endif
 	NVTRACE_LEAVE();
 }
-
+#else
+static void riva_get_EDID(struct fb_info *info, struct pci_dev *pdev)
+{
+}
+#endif
+#endif
 
 static void riva_get_edidinfo(struct fb_info *info)
 {

                 reply	other threads:[~2004-08-14 14:29 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20040814142828.GC25939@lst.de \
    --to=hch@lst.de \
    --cc=ajoshi@shell.unixbox.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®