From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: linux-kernel@vger.kernel.org, greg@kroah.com
Subject: [PATCH 05/29] gma500: Fix uninitialized variable and style issues
Date: Tue, 28 Jun 2011 23:04:18 +0100 [thread overview]
Message-ID: <20110628220402.898.83786.stgit@bob.linux.org.uk> (raw)
In-Reply-To: <20110628220151.898.15775.stgit@bob.linux.org.uk>
From: Andre Bartke <andre.bartke@googlemail.com>
The return variable of psb_gtt_pin() may be used
uninitialized. Also fixed some coding style issues.
Signed-off-by: Andre Bartke <andre.bartke@gmail.com>
[Reapplied by hand due to other changes]
Signed-off-by: Alan Cox <alan@linux.intel.com>
---
drivers/staging/gma500/psb_gtt.c | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/drivers/staging/gma500/psb_gtt.c b/drivers/staging/gma500/psb_gtt.c
index 6a24246..5a296e1 100644
--- a/drivers/staging/gma500/psb_gtt.c
+++ b/drivers/staging/gma500/psb_gtt.c
@@ -58,7 +58,7 @@ static inline uint32_t psb_gtt_mask_pte(uint32_t pfn, int type)
*/
u32 *psb_gtt_entry(struct drm_device *dev, struct gtt_range *r)
{
- struct drm_psb_private *dev_priv = dev->dev_private;
+ struct drm_psb_private *dev_priv = dev->dev_private;
unsigned long offset;
offset = r->resource.start - dev_priv->gtt_mem->start;
@@ -124,7 +124,7 @@ static void psb_gtt_remove(struct drm_device *dev, struct gtt_range *r)
WARN_ON(r->stolen);
gtt_slot = psb_gtt_entry(dev, r);
- pte = psb_gtt_mask_pte(page_to_pfn(dev_priv->scratch_page), 0);;
+ pte = psb_gtt_mask_pte(page_to_pfn(dev_priv->scratch_page), 0);
for (i = 0; i < r->npage; i++)
iowrite32(pte, gtt_slot++);
@@ -213,7 +213,7 @@ static void psb_gtt_detach_pages(struct gtt_range *gt)
*/
int psb_gtt_pin(struct gtt_range *gt)
{
- int ret;
+ int ret = 0;
struct drm_device *dev = gt->gem.dev;
struct drm_psb_private *dev_priv = dev->dev_private;
@@ -289,33 +289,33 @@ struct gtt_range *psb_gtt_alloc_range(struct drm_device *dev, int len,
struct resource *r = dev_priv->gtt_mem;
int ret;
unsigned long start, end;
-
+
if (backed) {
- /* The start of the GTT is the stolen pages */
- start = r->start;
- end = r->start + dev_priv->pg->stolen_size - 1;
+ /* The start of the GTT is the stolen pages */
+ start = r->start;
+ end = r->start + dev_priv->pg->stolen_size - 1;
} else {
- /* The rest we will use for GEM backed objects */
- start = r->start + dev_priv->pg->stolen_size;
- end = r->end;
+ /* The rest we will use for GEM backed objects */
+ start = r->start + dev_priv->pg->stolen_size;
+ end = r->end;
}
gt = kzalloc(sizeof(struct gtt_range), GFP_KERNEL);
if (gt == NULL)
return NULL;
- gt->resource.name = name;
- gt->stolen = backed;
- gt->in_gart = backed;
- /* Ensure this is set for non GEM objects */
- gt->gem.dev = dev;
+ gt->resource.name = name;
+ gt->stolen = backed;
+ gt->in_gart = backed;
+ /* Ensure this is set for non GEM objects */
+ gt->gem.dev = dev;
kref_init(>->kref);
ret = allocate_resource(dev_priv->gtt_mem, >->resource,
len, start, end, PAGE_SIZE, NULL, NULL);
if (ret == 0) {
- gt->offset = gt->resource.start - r->start;
+ gt->offset = gt->resource.start - r->start;
return gt;
- }
+ }
kfree(gt);
return NULL;
}
@@ -419,7 +419,7 @@ int psb_gtt_init(struct drm_device *dev, int resume)
dev_priv->pg = pg = psb_gtt_alloc(dev);
if (pg == NULL)
- return -ENOMEM;
+ return -ENOMEM;
pci_read_config_word(dev->pdev, PSB_GMCH_CTRL, &dev_priv->gmch_ctrl);
pci_write_config_word(dev->pdev, PSB_GMCH_CTRL,
next prev parent reply other threads:[~2011-06-28 22:04 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-28 22:02 [PATCH 00/29] GMA500 updates Alan Cox
2011-06-28 22:03 ` [PATCH 01/29] gma500: fix warnings Alan Cox
2011-06-28 22:03 ` [PATCH 02/29] gma500: Make GTT pages uncached Alan Cox
2011-06-28 22:03 ` [PATCH 03/29] gma500: Ensure the frame buffer has a linear virtual mapping Alan Cox
2011-06-28 22:03 ` [PATCH 04/29] gma500: Set the correct bits according to the pipe Alan Cox
2011-06-28 22:04 ` Alan Cox [this message]
2011-06-28 22:04 ` [PATCH 06/29] gma500: revamp frame buffer creation and handling Alan Cox
2011-06-29 16:38 ` Jesse Barnes
2011-06-29 18:44 ` Alan Cox
2011-06-28 22:04 ` [PATCH 07/29] gma500: Do sane FB cleanup Alan Cox
2011-06-28 22:04 ` [PATCH 08/29] gma500: trim some of the debug Alan Cox
2011-06-28 22:05 ` [PATCH 09/29] gma500: polish for completion of this phase Alan Cox
2011-06-28 22:05 ` [PATCH 10/29] gma500: 2D acceleration tidying Alan Cox
2011-06-28 22:05 ` [PATCH 11/29] gma500: nuke the last bits of TTM code Alan Cox
2011-06-28 22:05 ` [PATCH 12/29] gma500: nuke the PSB debug stuff Alan Cox
2011-06-28 22:06 ` [PATCH 13/29] gma500: Kill spare kref Alan Cox
2011-06-28 22:06 ` [PATCH 14/29] gma500: GEM glue Alan Cox
2011-06-28 22:06 ` [PATCH 15/29] gma500: Use the GEM tweaks to provide a GEM frame buffer Alan Cox
2011-06-28 22:06 ` [PATCH 16/29] gma500: CodingStyle pass Alan Cox
2011-06-28 22:07 ` [PATCH 17/29] gma500: 2D polish Alan Cox
2011-06-28 22:07 ` [PATCH 18/29] gma500: Medfield support Alan Cox
2011-06-28 22:07 ` [PATCH 19/29] gma500: Move our other GEM helper into the bits want to push into GEM Alan Cox
2011-06-28 22:07 ` [PATCH 20/29] gma500: Extract BIOSisy stuff from psb_drv Alan Cox
2011-06-28 22:08 ` [PATCH 21/29] gma500: psb_fb tidy/cleanup pass Alan Cox
2011-06-28 22:08 ` [PATCH 22/29] gma500: Only fiddle with clock gating on PSB Alan Cox
2011-06-28 22:08 ` [PATCH 23/29] gma500: being abstracting out devices a bit more Alan Cox
2011-06-28 22:08 ` [PATCH 24/29] gma500: continue abstracting platform specific code Alan Cox
2011-06-28 22:08 ` [PATCH 25/29] gma500: Fix early Medfield crash Alan Cox
2011-06-28 22:09 ` [PATCH 26/29] gma500: Read the GCT panel type information for Medfield Alan Cox
2011-06-28 22:09 ` [PATCH 27/29] gma500: enable Medfield CRTC support Alan Cox
2011-06-28 22:09 ` [PATCH 28/29] gma500: drivers/staging/gma501/psb_intel_display.c: fix build Alan Cox
2011-06-28 22:09 ` [PATCH 29/29] gma500: fix build without backlight device support Alan Cox
-- strict thread matches above, loose matches on Subject: below --
2011-06-16 16:05 [PATCH 00/29] gma500: pending patches versus next 20110616 Alan Cox
2011-06-16 16:07 ` [PATCH 05/29] gma500: Fix uninitialized variable and style issues Alan Cox
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=20110628220402.898.83786.stgit@bob.linux.org.uk \
--to=alan@lxorguk.ukuu.org.uk \
--cc=greg@kroah.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;
as well as URLs for NNTP newsgroup(s).