* [PATCH] drm: squash lines for simple wrapper functions
@ 2016-09-06 23:04 ` Masahiro Yamada
0 siblings, 0 replies; 11+ messages in thread
From: Masahiro Yamada @ 2016-09-06 23:04 UTC (permalink / raw)
To: David Airlie, dri-devel
Cc: Masahiro Yamada, Gustavo Padovan, Yakir Yang, Huang Rui,
Alex Deucher, Monk Liu, Chunming Zhou, Daniel Vetter,
Heiko Stuebner, Eric Huang, Flora Cui, Inki Dae,
Krzysztof Kozlowski, Dave Airlie, Jani Nikula, intel-gfx,
Frediano Ziglio, Samuel Li, Christian König, Tomasz Figa,
Sumit Semwal, linux-kernel, Tom St Denis, Dan Carpenter
Remove unneeded variables and assignments.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +-----
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 6 +-----
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 6 +-----
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 20 ++++----------------
drivers/gpu/drm/drm_dp_mst_topology.c | 7 ++-----
drivers/gpu/drm/i915/i915_drv.c | 8 +-------
drivers/gpu/drm/qxl/qxl_draw.c | 7 ++-----
drivers/gpu/drm/qxl/qxl_release.c | 7 ++-----
drivers/gpu/drm/radeon/cik.c | 6 +-----
drivers/gpu/drm/radeon/r100.c | 6 +-----
drivers/gpu/drm/radeon/r600.c | 6 +-----
11 files changed, 17 insertions(+), 68 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index b818461..0d5307a 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -5854,11 +5854,7 @@ static int gfx_v8_0_set_clockgating_state(void *handle,
static u32 gfx_v8_0_ring_get_rptr_gfx(struct amdgpu_ring *ring)
{
- u32 rptr;
-
- rptr = ring->adev->wb.wb[ring->rptr_offs];
-
- return rptr;
+ return ring->adev->wb.wb[ring->rptr_offs];
}
static u32 gfx_v8_0_ring_get_wptr_gfx(struct amdgpu_ring *ring)
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
index a64715d..b165c78 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
@@ -190,12 +190,8 @@ out:
*/
static uint32_t sdma_v2_4_ring_get_rptr(struct amdgpu_ring *ring)
{
- u32 rptr;
-
/* XXX check if swapping is necessary on BE */
- rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2;
-
- return rptr;
+ return ring->adev->wb.wb[ring->rptr_offs] >> 2;
}
/**
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
index 653ce5e..cf253b9 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
@@ -335,12 +335,8 @@ out:
*/
static uint32_t sdma_v3_0_ring_get_rptr(struct amdgpu_ring *ring)
{
- u32 rptr;
-
/* XXX check if swapping is necessary on BE */
- rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2;
-
- return rptr;
+ return ring->adev->wb.wb[ring->rptr_offs] >> 2;
}
/**
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
index 48030f0..d37d112 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
@@ -1073,34 +1073,22 @@ void analogix_dp_set_lane3_link_training(struct analogix_dp_device *dp,
u32 analogix_dp_get_lane0_link_training(struct analogix_dp_device *dp)
{
- u32 reg;
-
- reg = readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
- return reg;
+ return readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
}
u32 analogix_dp_get_lane1_link_training(struct analogix_dp_device *dp)
{
- u32 reg;
-
- reg = readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
- return reg;
+ return readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
}
u32 analogix_dp_get_lane2_link_training(struct analogix_dp_device *dp)
{
- u32 reg;
-
- reg = readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
- return reg;
+ return readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
}
u32 analogix_dp_get_lane3_link_training(struct analogix_dp_device *dp)
{
- u32 reg;
-
- reg = readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
- return reg;
+ return readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
}
void analogix_dp_reset_macro(struct analogix_dp_device *dp)
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index 04e4571..302bdcb 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -737,16 +737,13 @@ static void drm_dp_mst_put_payload_id(struct drm_dp_mst_topology_mgr *mgr,
static bool check_txmsg_state(struct drm_dp_mst_topology_mgr *mgr,
struct drm_dp_sideband_msg_tx *txmsg)
{
- bool ret;
-
/*
* All updates to txmsg->state are protected by mgr->qlock, and the two
* cases we check here are terminal states. For those the barriers
* provided by the wake_up/wait_event pair are enough.
*/
- ret = (txmsg->state == DRM_DP_SIDEBAND_TX_RX ||
- txmsg->state == DRM_DP_SIDEBAND_TX_TIMEOUT);
- return ret;
+ return txmsg->state == DRM_DP_SIDEBAND_TX_RX ||
+ txmsg->state == DRM_DP_SIDEBAND_TX_TIMEOUT;
}
static int drm_dp_mst_wait_tx_reply(struct drm_dp_mst_branch *mstb,
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 95ddd56..59d029d 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1361,13 +1361,7 @@ void i915_driver_unload(struct drm_device *dev)
static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
{
- int ret;
-
- ret = i915_gem_open(dev, file);
- if (ret)
- return ret;
-
- return 0;
+ return i915_gem_open(dev, file);
}
/**
diff --git a/drivers/gpu/drm/qxl/qxl_draw.c b/drivers/gpu/drm/qxl/qxl_draw.c
index ffe8853..9b728ed 100644
--- a/drivers/gpu/drm/qxl/qxl_draw.c
+++ b/drivers/gpu/drm/qxl/qxl_draw.c
@@ -57,11 +57,8 @@ static struct qxl_rect *drawable_set_clipping(struct qxl_device *qdev,
static int
alloc_drawable(struct qxl_device *qdev, struct qxl_release **release)
{
- int ret;
- ret = qxl_alloc_release_reserved(qdev, sizeof(struct qxl_drawable),
- QXL_RELEASE_DRAWABLE, release,
- NULL);
- return ret;
+ return qxl_alloc_release_reserved(qdev, sizeof(struct qxl_drawable),
+ QXL_RELEASE_DRAWABLE, release, NULL);
}
static void
diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c
index f599cd0..cd83f05 100644
--- a/drivers/gpu/drm/qxl/qxl_release.c
+++ b/drivers/gpu/drm/qxl/qxl_release.c
@@ -203,12 +203,9 @@ qxl_release_free(struct qxl_device *qdev,
static int qxl_release_bo_alloc(struct qxl_device *qdev,
struct qxl_bo **bo)
{
- int ret;
/* pin releases bo's they are too messy to evict */
- ret = qxl_bo_create(qdev, PAGE_SIZE, false, true,
- QXL_GEM_DOMAIN_VRAM, NULL,
- bo);
- return ret;
+ return qxl_bo_create(qdev, PAGE_SIZE, false, true,
+ QXL_GEM_DOMAIN_VRAM, NULL, bo);
}
int qxl_release_list_add(struct qxl_release *release, struct qxl_bo *bo)
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index 0c1b9ff..4da1140 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -4201,11 +4201,7 @@ u32 cik_gfx_get_rptr(struct radeon_device *rdev,
u32 cik_gfx_get_wptr(struct radeon_device *rdev,
struct radeon_ring *ring)
{
- u32 wptr;
-
- wptr = RREG32(CP_RB0_WPTR);
-
- return wptr;
+ return RREG32(CP_RB0_WPTR);
}
void cik_gfx_set_wptr(struct radeon_device *rdev,
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index f25994b..f5e84f4 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -1071,11 +1071,7 @@ u32 r100_gfx_get_rptr(struct radeon_device *rdev,
u32 r100_gfx_get_wptr(struct radeon_device *rdev,
struct radeon_ring *ring)
{
- u32 wptr;
-
- wptr = RREG32(RADEON_CP_RB_WPTR);
-
- return wptr;
+ return RREG32(RADEON_CP_RB_WPTR);
}
void r100_gfx_set_wptr(struct radeon_device *rdev,
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 9247e7d..f034687 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2631,11 +2631,7 @@ u32 r600_gfx_get_rptr(struct radeon_device *rdev,
u32 r600_gfx_get_wptr(struct radeon_device *rdev,
struct radeon_ring *ring)
{
- u32 wptr;
-
- wptr = RREG32(R600_CP_RB_WPTR);
-
- return wptr;
+ return RREG32(R600_CP_RB_WPTR);
}
void r600_gfx_set_wptr(struct radeon_device *rdev,
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH] drm: squash lines for simple wrapper functions
@ 2016-09-06 23:04 ` Masahiro Yamada
0 siblings, 0 replies; 11+ messages in thread
From: Masahiro Yamada @ 2016-09-06 23:04 UTC (permalink / raw)
To: David Airlie, dri-devel
Cc: Masahiro Yamada, Gustavo Padovan, Yakir Yang, Huang Rui,
Alex Deucher, Monk Liu, Chunming Zhou, Daniel Vetter,
Heiko Stuebner, Eric Huang, Flora Cui, Inki Dae,
Krzysztof Kozlowski, Dave Airlie, Jani Nikula, intel-gfx,
Frediano Ziglio, Samuel Li, Christian König
Remove unneeded variables and assignments.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
---
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +-----
drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 6 +-----
drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 6 +-----
drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 20 ++++----------------
drivers/gpu/drm/drm_dp_mst_topology.c | 7 ++-----
drivers/gpu/drm/i915/i915_drv.c | 8 +-------
drivers/gpu/drm/qxl/qxl_draw.c | 7 ++-----
drivers/gpu/drm/qxl/qxl_release.c | 7 ++-----
drivers/gpu/drm/radeon/cik.c | 6 +-----
drivers/gpu/drm/radeon/r100.c | 6 +-----
drivers/gpu/drm/radeon/r600.c | 6 +-----
11 files changed, 17 insertions(+), 68 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
index b818461..0d5307a 100644
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
@@ -5854,11 +5854,7 @@ static int gfx_v8_0_set_clockgating_state(void *handle,
static u32 gfx_v8_0_ring_get_rptr_gfx(struct amdgpu_ring *ring)
{
- u32 rptr;
-
- rptr = ring->adev->wb.wb[ring->rptr_offs];
-
- return rptr;
+ return ring->adev->wb.wb[ring->rptr_offs];
}
static u32 gfx_v8_0_ring_get_wptr_gfx(struct amdgpu_ring *ring)
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
index a64715d..b165c78 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
@@ -190,12 +190,8 @@ out:
*/
static uint32_t sdma_v2_4_ring_get_rptr(struct amdgpu_ring *ring)
{
- u32 rptr;
-
/* XXX check if swapping is necessary on BE */
- rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2;
-
- return rptr;
+ return ring->adev->wb.wb[ring->rptr_offs] >> 2;
}
/**
diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
index 653ce5e..cf253b9 100644
--- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
@@ -335,12 +335,8 @@ out:
*/
static uint32_t sdma_v3_0_ring_get_rptr(struct amdgpu_ring *ring)
{
- u32 rptr;
-
/* XXX check if swapping is necessary on BE */
- rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2;
-
- return rptr;
+ return ring->adev->wb.wb[ring->rptr_offs] >> 2;
}
/**
diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
index 48030f0..d37d112 100644
--- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
+++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
@@ -1073,34 +1073,22 @@ void analogix_dp_set_lane3_link_training(struct analogix_dp_device *dp,
u32 analogix_dp_get_lane0_link_training(struct analogix_dp_device *dp)
{
- u32 reg;
-
- reg = readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
- return reg;
+ return readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
}
u32 analogix_dp_get_lane1_link_training(struct analogix_dp_device *dp)
{
- u32 reg;
-
- reg = readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
- return reg;
+ return readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
}
u32 analogix_dp_get_lane2_link_training(struct analogix_dp_device *dp)
{
- u32 reg;
-
- reg = readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
- return reg;
+ return readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
}
u32 analogix_dp_get_lane3_link_training(struct analogix_dp_device *dp)
{
- u32 reg;
-
- reg = readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
- return reg;
+ return readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
}
void analogix_dp_reset_macro(struct analogix_dp_device *dp)
diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
index 04e4571..302bdcb 100644
--- a/drivers/gpu/drm/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/drm_dp_mst_topology.c
@@ -737,16 +737,13 @@ static void drm_dp_mst_put_payload_id(struct drm_dp_mst_topology_mgr *mgr,
static bool check_txmsg_state(struct drm_dp_mst_topology_mgr *mgr,
struct drm_dp_sideband_msg_tx *txmsg)
{
- bool ret;
-
/*
* All updates to txmsg->state are protected by mgr->qlock, and the two
* cases we check here are terminal states. For those the barriers
* provided by the wake_up/wait_event pair are enough.
*/
- ret = (txmsg->state == DRM_DP_SIDEBAND_TX_RX ||
- txmsg->state == DRM_DP_SIDEBAND_TX_TIMEOUT);
- return ret;
+ return txmsg->state == DRM_DP_SIDEBAND_TX_RX ||
+ txmsg->state == DRM_DP_SIDEBAND_TX_TIMEOUT;
}
static int drm_dp_mst_wait_tx_reply(struct drm_dp_mst_branch *mstb,
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 95ddd56..59d029d 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1361,13 +1361,7 @@ void i915_driver_unload(struct drm_device *dev)
static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
{
- int ret;
-
- ret = i915_gem_open(dev, file);
- if (ret)
- return ret;
-
- return 0;
+ return i915_gem_open(dev, file);
}
/**
diff --git a/drivers/gpu/drm/qxl/qxl_draw.c b/drivers/gpu/drm/qxl/qxl_draw.c
index ffe8853..9b728ed 100644
--- a/drivers/gpu/drm/qxl/qxl_draw.c
+++ b/drivers/gpu/drm/qxl/qxl_draw.c
@@ -57,11 +57,8 @@ static struct qxl_rect *drawable_set_clipping(struct qxl_device *qdev,
static int
alloc_drawable(struct qxl_device *qdev, struct qxl_release **release)
{
- int ret;
- ret = qxl_alloc_release_reserved(qdev, sizeof(struct qxl_drawable),
- QXL_RELEASE_DRAWABLE, release,
- NULL);
- return ret;
+ return qxl_alloc_release_reserved(qdev, sizeof(struct qxl_drawable),
+ QXL_RELEASE_DRAWABLE, release, NULL);
}
static void
diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c
index f599cd0..cd83f05 100644
--- a/drivers/gpu/drm/qxl/qxl_release.c
+++ b/drivers/gpu/drm/qxl/qxl_release.c
@@ -203,12 +203,9 @@ qxl_release_free(struct qxl_device *qdev,
static int qxl_release_bo_alloc(struct qxl_device *qdev,
struct qxl_bo **bo)
{
- int ret;
/* pin releases bo's they are too messy to evict */
- ret = qxl_bo_create(qdev, PAGE_SIZE, false, true,
- QXL_GEM_DOMAIN_VRAM, NULL,
- bo);
- return ret;
+ return qxl_bo_create(qdev, PAGE_SIZE, false, true,
+ QXL_GEM_DOMAIN_VRAM, NULL, bo);
}
int qxl_release_list_add(struct qxl_release *release, struct qxl_bo *bo)
diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
index 0c1b9ff..4da1140 100644
--- a/drivers/gpu/drm/radeon/cik.c
+++ b/drivers/gpu/drm/radeon/cik.c
@@ -4201,11 +4201,7 @@ u32 cik_gfx_get_rptr(struct radeon_device *rdev,
u32 cik_gfx_get_wptr(struct radeon_device *rdev,
struct radeon_ring *ring)
{
- u32 wptr;
-
- wptr = RREG32(CP_RB0_WPTR);
-
- return wptr;
+ return RREG32(CP_RB0_WPTR);
}
void cik_gfx_set_wptr(struct radeon_device *rdev,
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index f25994b..f5e84f4 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -1071,11 +1071,7 @@ u32 r100_gfx_get_rptr(struct radeon_device *rdev,
u32 r100_gfx_get_wptr(struct radeon_device *rdev,
struct radeon_ring *ring)
{
- u32 wptr;
-
- wptr = RREG32(RADEON_CP_RB_WPTR);
-
- return wptr;
+ return RREG32(RADEON_CP_RB_WPTR);
}
void r100_gfx_set_wptr(struct radeon_device *rdev,
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 9247e7d..f034687 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2631,11 +2631,7 @@ u32 r600_gfx_get_rptr(struct radeon_device *rdev,
u32 r600_gfx_get_wptr(struct radeon_device *rdev,
struct radeon_ring *ring)
{
- u32 wptr;
-
- wptr = RREG32(R600_CP_RB_WPTR);
-
- return wptr;
+ return RREG32(R600_CP_RB_WPTR);
}
void r600_gfx_set_wptr(struct radeon_device *rdev,
--
1.9.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH] drm: squash lines for simple wrapper functions
2016-09-06 23:04 ` Masahiro Yamada
@ 2016-09-07 7:16 ` Christian König
-1 siblings, 0 replies; 11+ messages in thread
From: Christian König @ 2016-09-07 7:16 UTC (permalink / raw)
To: Masahiro Yamada, David Airlie, dri-devel
Cc: Gustavo Padovan, Yakir Yang, Huang, Ray, Deucher, Alexander, Liu,
Monk, Zhou, David(ChunMing),
Daniel Vetter, Heiko Stuebner, Huang, JinHuiEric, Cui, Flora,
Inki Dae, Krzysztof Kozlowski, Dave Airlie, Jani Nikula,
intel-gfx, Frediano Ziglio, Li, Samuel, Tomasz Figa,
Sumit Semwal, linux-kernel, StDenis, Tom, Dan Carpenter
Am 07.09.2016 um 01:04 schrieb Masahiro Yamada:
> Remove unneeded variables and assignments.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tom StDenis was working on a similar patch for amdgpu as well, please
make sure that your work doesn't conflict with his.
Apart from that looks good to me. But I would prefer this to be split up
per driver, cause I can't really give my rb on this patch when it
touches drivers all over the place.
On the other hand feel free to add my Acked-by and merge it as general
cleanup through Dave directly.
Regards,
Christian.
> ---
>
> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +-----
> drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 6 +-----
> drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 6 +-----
> drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 20 ++++----------------
> drivers/gpu/drm/drm_dp_mst_topology.c | 7 ++-----
> drivers/gpu/drm/i915/i915_drv.c | 8 +-------
> drivers/gpu/drm/qxl/qxl_draw.c | 7 ++-----
> drivers/gpu/drm/qxl/qxl_release.c | 7 ++-----
> drivers/gpu/drm/radeon/cik.c | 6 +-----
> drivers/gpu/drm/radeon/r100.c | 6 +-----
> drivers/gpu/drm/radeon/r600.c | 6 +-----
> 11 files changed, 17 insertions(+), 68 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> index b818461..0d5307a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> @@ -5854,11 +5854,7 @@ static int gfx_v8_0_set_clockgating_state(void *handle,
>
> static u32 gfx_v8_0_ring_get_rptr_gfx(struct amdgpu_ring *ring)
> {
> - u32 rptr;
> -
> - rptr = ring->adev->wb.wb[ring->rptr_offs];
> -
> - return rptr;
> + return ring->adev->wb.wb[ring->rptr_offs];
> }
>
> static u32 gfx_v8_0_ring_get_wptr_gfx(struct amdgpu_ring *ring)
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> index a64715d..b165c78 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> @@ -190,12 +190,8 @@ out:
> */
> static uint32_t sdma_v2_4_ring_get_rptr(struct amdgpu_ring *ring)
> {
> - u32 rptr;
> -
> /* XXX check if swapping is necessary on BE */
> - rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2;
> -
> - return rptr;
> + return ring->adev->wb.wb[ring->rptr_offs] >> 2;
> }
>
> /**
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> index 653ce5e..cf253b9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> @@ -335,12 +335,8 @@ out:
> */
> static uint32_t sdma_v3_0_ring_get_rptr(struct amdgpu_ring *ring)
> {
> - u32 rptr;
> -
> /* XXX check if swapping is necessary on BE */
> - rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2;
> -
> - return rptr;
> + return ring->adev->wb.wb[ring->rptr_offs] >> 2;
> }
>
> /**
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> index 48030f0..d37d112 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> @@ -1073,34 +1073,22 @@ void analogix_dp_set_lane3_link_training(struct analogix_dp_device *dp,
>
> u32 analogix_dp_get_lane0_link_training(struct analogix_dp_device *dp)
> {
> - u32 reg;
> -
> - reg = readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
> - return reg;
> + return readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
> }
>
> u32 analogix_dp_get_lane1_link_training(struct analogix_dp_device *dp)
> {
> - u32 reg;
> -
> - reg = readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
> - return reg;
> + return readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
> }
>
> u32 analogix_dp_get_lane2_link_training(struct analogix_dp_device *dp)
> {
> - u32 reg;
> -
> - reg = readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
> - return reg;
> + return readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
> }
>
> u32 analogix_dp_get_lane3_link_training(struct analogix_dp_device *dp)
> {
> - u32 reg;
> -
> - reg = readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
> - return reg;
> + return readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
> }
>
> void analogix_dp_reset_macro(struct analogix_dp_device *dp)
> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
> index 04e4571..302bdcb 100644
> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> @@ -737,16 +737,13 @@ static void drm_dp_mst_put_payload_id(struct drm_dp_mst_topology_mgr *mgr,
> static bool check_txmsg_state(struct drm_dp_mst_topology_mgr *mgr,
> struct drm_dp_sideband_msg_tx *txmsg)
> {
> - bool ret;
> -
> /*
> * All updates to txmsg->state are protected by mgr->qlock, and the two
> * cases we check here are terminal states. For those the barriers
> * provided by the wake_up/wait_event pair are enough.
> */
> - ret = (txmsg->state == DRM_DP_SIDEBAND_TX_RX ||
> - txmsg->state == DRM_DP_SIDEBAND_TX_TIMEOUT);
> - return ret;
> + return txmsg->state == DRM_DP_SIDEBAND_TX_RX ||
> + txmsg->state == DRM_DP_SIDEBAND_TX_TIMEOUT;
> }
>
> static int drm_dp_mst_wait_tx_reply(struct drm_dp_mst_branch *mstb,
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 95ddd56..59d029d 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1361,13 +1361,7 @@ void i915_driver_unload(struct drm_device *dev)
>
> static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
> {
> - int ret;
> -
> - ret = i915_gem_open(dev, file);
> - if (ret)
> - return ret;
> -
> - return 0;
> + return i915_gem_open(dev, file);
> }
>
> /**
> diff --git a/drivers/gpu/drm/qxl/qxl_draw.c b/drivers/gpu/drm/qxl/qxl_draw.c
> index ffe8853..9b728ed 100644
> --- a/drivers/gpu/drm/qxl/qxl_draw.c
> +++ b/drivers/gpu/drm/qxl/qxl_draw.c
> @@ -57,11 +57,8 @@ static struct qxl_rect *drawable_set_clipping(struct qxl_device *qdev,
> static int
> alloc_drawable(struct qxl_device *qdev, struct qxl_release **release)
> {
> - int ret;
> - ret = qxl_alloc_release_reserved(qdev, sizeof(struct qxl_drawable),
> - QXL_RELEASE_DRAWABLE, release,
> - NULL);
> - return ret;
> + return qxl_alloc_release_reserved(qdev, sizeof(struct qxl_drawable),
> + QXL_RELEASE_DRAWABLE, release, NULL);
> }
>
> static void
> diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c
> index f599cd0..cd83f05 100644
> --- a/drivers/gpu/drm/qxl/qxl_release.c
> +++ b/drivers/gpu/drm/qxl/qxl_release.c
> @@ -203,12 +203,9 @@ qxl_release_free(struct qxl_device *qdev,
> static int qxl_release_bo_alloc(struct qxl_device *qdev,
> struct qxl_bo **bo)
> {
> - int ret;
> /* pin releases bo's they are too messy to evict */
> - ret = qxl_bo_create(qdev, PAGE_SIZE, false, true,
> - QXL_GEM_DOMAIN_VRAM, NULL,
> - bo);
> - return ret;
> + return qxl_bo_create(qdev, PAGE_SIZE, false, true,
> + QXL_GEM_DOMAIN_VRAM, NULL, bo);
> }
>
> int qxl_release_list_add(struct qxl_release *release, struct qxl_bo *bo)
> diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
> index 0c1b9ff..4da1140 100644
> --- a/drivers/gpu/drm/radeon/cik.c
> +++ b/drivers/gpu/drm/radeon/cik.c
> @@ -4201,11 +4201,7 @@ u32 cik_gfx_get_rptr(struct radeon_device *rdev,
> u32 cik_gfx_get_wptr(struct radeon_device *rdev,
> struct radeon_ring *ring)
> {
> - u32 wptr;
> -
> - wptr = RREG32(CP_RB0_WPTR);
> -
> - return wptr;
> + return RREG32(CP_RB0_WPTR);
> }
>
> void cik_gfx_set_wptr(struct radeon_device *rdev,
> diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
> index f25994b..f5e84f4 100644
> --- a/drivers/gpu/drm/radeon/r100.c
> +++ b/drivers/gpu/drm/radeon/r100.c
> @@ -1071,11 +1071,7 @@ u32 r100_gfx_get_rptr(struct radeon_device *rdev,
> u32 r100_gfx_get_wptr(struct radeon_device *rdev,
> struct radeon_ring *ring)
> {
> - u32 wptr;
> -
> - wptr = RREG32(RADEON_CP_RB_WPTR);
> -
> - return wptr;
> + return RREG32(RADEON_CP_RB_WPTR);
> }
>
> void r100_gfx_set_wptr(struct radeon_device *rdev,
> diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
> index 9247e7d..f034687 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -2631,11 +2631,7 @@ u32 r600_gfx_get_rptr(struct radeon_device *rdev,
> u32 r600_gfx_get_wptr(struct radeon_device *rdev,
> struct radeon_ring *ring)
> {
> - u32 wptr;
> -
> - wptr = RREG32(R600_CP_RB_WPTR);
> -
> - return wptr;
> + return RREG32(R600_CP_RB_WPTR);
> }
>
> void r600_gfx_set_wptr(struct radeon_device *rdev,
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] drm: squash lines for simple wrapper functions
@ 2016-09-07 7:16 ` Christian König
0 siblings, 0 replies; 11+ messages in thread
From: Christian König @ 2016-09-07 7:16 UTC (permalink / raw)
To: Masahiro Yamada, David Airlie, dri-devel
Cc: Krzysztof Kozlowski, Heiko Stuebner, Huang, Ray, Yakir Yang,
Huang, JinHuiEric, Daniel Vetter, Cui, Flora, Gustavo Padovan,
Sumit Semwal, StDenis, Tom, Zhou, David(ChunMing),
Dave Airlie, Dan Carpenter, intel-gfx, Inki Dae, Deucher,
Alexander, Liu, Monk, linux-kernel, Li, Samuel, Tomasz Figa,
Frediano Ziglio
Am 07.09.2016 um 01:04 schrieb Masahiro Yamada:
> Remove unneeded variables and assignments.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Tom StDenis was working on a similar patch for amdgpu as well, please
make sure that your work doesn't conflict with his.
Apart from that looks good to me. But I would prefer this to be split up
per driver, cause I can't really give my rb on this patch when it
touches drivers all over the place.
On the other hand feel free to add my Acked-by and merge it as general
cleanup through Dave directly.
Regards,
Christian.
> ---
>
> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +-----
> drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 6 +-----
> drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 6 +-----
> drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 20 ++++----------------
> drivers/gpu/drm/drm_dp_mst_topology.c | 7 ++-----
> drivers/gpu/drm/i915/i915_drv.c | 8 +-------
> drivers/gpu/drm/qxl/qxl_draw.c | 7 ++-----
> drivers/gpu/drm/qxl/qxl_release.c | 7 ++-----
> drivers/gpu/drm/radeon/cik.c | 6 +-----
> drivers/gpu/drm/radeon/r100.c | 6 +-----
> drivers/gpu/drm/radeon/r600.c | 6 +-----
> 11 files changed, 17 insertions(+), 68 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> index b818461..0d5307a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> @@ -5854,11 +5854,7 @@ static int gfx_v8_0_set_clockgating_state(void *handle,
>
> static u32 gfx_v8_0_ring_get_rptr_gfx(struct amdgpu_ring *ring)
> {
> - u32 rptr;
> -
> - rptr = ring->adev->wb.wb[ring->rptr_offs];
> -
> - return rptr;
> + return ring->adev->wb.wb[ring->rptr_offs];
> }
>
> static u32 gfx_v8_0_ring_get_wptr_gfx(struct amdgpu_ring *ring)
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> index a64715d..b165c78 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> @@ -190,12 +190,8 @@ out:
> */
> static uint32_t sdma_v2_4_ring_get_rptr(struct amdgpu_ring *ring)
> {
> - u32 rptr;
> -
> /* XXX check if swapping is necessary on BE */
> - rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2;
> -
> - return rptr;
> + return ring->adev->wb.wb[ring->rptr_offs] >> 2;
> }
>
> /**
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> index 653ce5e..cf253b9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> @@ -335,12 +335,8 @@ out:
> */
> static uint32_t sdma_v3_0_ring_get_rptr(struct amdgpu_ring *ring)
> {
> - u32 rptr;
> -
> /* XXX check if swapping is necessary on BE */
> - rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2;
> -
> - return rptr;
> + return ring->adev->wb.wb[ring->rptr_offs] >> 2;
> }
>
> /**
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> index 48030f0..d37d112 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> @@ -1073,34 +1073,22 @@ void analogix_dp_set_lane3_link_training(struct analogix_dp_device *dp,
>
> u32 analogix_dp_get_lane0_link_training(struct analogix_dp_device *dp)
> {
> - u32 reg;
> -
> - reg = readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
> - return reg;
> + return readl(dp->reg_base + ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
> }
>
> u32 analogix_dp_get_lane1_link_training(struct analogix_dp_device *dp)
> {
> - u32 reg;
> -
> - reg = readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
> - return reg;
> + return readl(dp->reg_base + ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
> }
>
> u32 analogix_dp_get_lane2_link_training(struct analogix_dp_device *dp)
> {
> - u32 reg;
> -
> - reg = readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
> - return reg;
> + return readl(dp->reg_base + ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
> }
>
> u32 analogix_dp_get_lane3_link_training(struct analogix_dp_device *dp)
> {
> - u32 reg;
> -
> - reg = readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
> - return reg;
> + return readl(dp->reg_base + ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
> }
>
> void analogix_dp_reset_macro(struct analogix_dp_device *dp)
> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c b/drivers/gpu/drm/drm_dp_mst_topology.c
> index 04e4571..302bdcb 100644
> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> @@ -737,16 +737,13 @@ static void drm_dp_mst_put_payload_id(struct drm_dp_mst_topology_mgr *mgr,
> static bool check_txmsg_state(struct drm_dp_mst_topology_mgr *mgr,
> struct drm_dp_sideband_msg_tx *txmsg)
> {
> - bool ret;
> -
> /*
> * All updates to txmsg->state are protected by mgr->qlock, and the two
> * cases we check here are terminal states. For those the barriers
> * provided by the wake_up/wait_event pair are enough.
> */
> - ret = (txmsg->state == DRM_DP_SIDEBAND_TX_RX ||
> - txmsg->state == DRM_DP_SIDEBAND_TX_TIMEOUT);
> - return ret;
> + return txmsg->state == DRM_DP_SIDEBAND_TX_RX ||
> + txmsg->state == DRM_DP_SIDEBAND_TX_TIMEOUT;
> }
>
> static int drm_dp_mst_wait_tx_reply(struct drm_dp_mst_branch *mstb,
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 95ddd56..59d029d 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1361,13 +1361,7 @@ void i915_driver_unload(struct drm_device *dev)
>
> static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
> {
> - int ret;
> -
> - ret = i915_gem_open(dev, file);
> - if (ret)
> - return ret;
> -
> - return 0;
> + return i915_gem_open(dev, file);
> }
>
> /**
> diff --git a/drivers/gpu/drm/qxl/qxl_draw.c b/drivers/gpu/drm/qxl/qxl_draw.c
> index ffe8853..9b728ed 100644
> --- a/drivers/gpu/drm/qxl/qxl_draw.c
> +++ b/drivers/gpu/drm/qxl/qxl_draw.c
> @@ -57,11 +57,8 @@ static struct qxl_rect *drawable_set_clipping(struct qxl_device *qdev,
> static int
> alloc_drawable(struct qxl_device *qdev, struct qxl_release **release)
> {
> - int ret;
> - ret = qxl_alloc_release_reserved(qdev, sizeof(struct qxl_drawable),
> - QXL_RELEASE_DRAWABLE, release,
> - NULL);
> - return ret;
> + return qxl_alloc_release_reserved(qdev, sizeof(struct qxl_drawable),
> + QXL_RELEASE_DRAWABLE, release, NULL);
> }
>
> static void
> diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_release.c
> index f599cd0..cd83f05 100644
> --- a/drivers/gpu/drm/qxl/qxl_release.c
> +++ b/drivers/gpu/drm/qxl/qxl_release.c
> @@ -203,12 +203,9 @@ qxl_release_free(struct qxl_device *qdev,
> static int qxl_release_bo_alloc(struct qxl_device *qdev,
> struct qxl_bo **bo)
> {
> - int ret;
> /* pin releases bo's they are too messy to evict */
> - ret = qxl_bo_create(qdev, PAGE_SIZE, false, true,
> - QXL_GEM_DOMAIN_VRAM, NULL,
> - bo);
> - return ret;
> + return qxl_bo_create(qdev, PAGE_SIZE, false, true,
> + QXL_GEM_DOMAIN_VRAM, NULL, bo);
> }
>
> int qxl_release_list_add(struct qxl_release *release, struct qxl_bo *bo)
> diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
> index 0c1b9ff..4da1140 100644
> --- a/drivers/gpu/drm/radeon/cik.c
> +++ b/drivers/gpu/drm/radeon/cik.c
> @@ -4201,11 +4201,7 @@ u32 cik_gfx_get_rptr(struct radeon_device *rdev,
> u32 cik_gfx_get_wptr(struct radeon_device *rdev,
> struct radeon_ring *ring)
> {
> - u32 wptr;
> -
> - wptr = RREG32(CP_RB0_WPTR);
> -
> - return wptr;
> + return RREG32(CP_RB0_WPTR);
> }
>
> void cik_gfx_set_wptr(struct radeon_device *rdev,
> diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
> index f25994b..f5e84f4 100644
> --- a/drivers/gpu/drm/radeon/r100.c
> +++ b/drivers/gpu/drm/radeon/r100.c
> @@ -1071,11 +1071,7 @@ u32 r100_gfx_get_rptr(struct radeon_device *rdev,
> u32 r100_gfx_get_wptr(struct radeon_device *rdev,
> struct radeon_ring *ring)
> {
> - u32 wptr;
> -
> - wptr = RREG32(RADEON_CP_RB_WPTR);
> -
> - return wptr;
> + return RREG32(RADEON_CP_RB_WPTR);
> }
>
> void r100_gfx_set_wptr(struct radeon_device *rdev,
> diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
> index 9247e7d..f034687 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -2631,11 +2631,7 @@ u32 r600_gfx_get_rptr(struct radeon_device *rdev,
> u32 r600_gfx_get_wptr(struct radeon_device *rdev,
> struct radeon_ring *ring)
> {
> - u32 wptr;
> -
> - wptr = RREG32(R600_CP_RB_WPTR);
> -
> - return wptr;
> + return RREG32(R600_CP_RB_WPTR);
> }
>
> void r600_gfx_set_wptr(struct radeon_device *rdev,
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] drm: squash lines for simple wrapper functions
2016-09-06 23:04 ` Masahiro Yamada
@ 2016-09-07 8:34 ` Jani Nikula
-1 siblings, 0 replies; 11+ messages in thread
From: Jani Nikula @ 2016-09-07 8:34 UTC (permalink / raw)
To: Masahiro Yamada, David Airlie, dri-devel
Cc: Masahiro Yamada, Gustavo Padovan, Yakir Yang, Huang Rui,
Alex Deucher, Monk Liu, Chunming Zhou, Daniel Vetter,
Heiko Stuebner, Eric Huang, Flora Cui, Inki Dae,
Krzysztof Kozlowski, Dave Airlie, intel-gfx, Frediano Ziglio,
Samuel Li, Christian König, Tomasz Figa, Sumit Semwal,
linux-kernel, Tom St Denis, Dan Carpenter
On Wed, 07 Sep 2016, Masahiro Yamada <yamada.masahiro@socionext.com> wrote:
> Remove unneeded variables and assignments.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
...
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 95ddd56..59d029d 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1361,13 +1361,7 @@ void i915_driver_unload(struct drm_device *dev)
>
> static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
> {
> - int ret;
> -
> - ret = i915_gem_open(dev, file);
> - if (ret)
> - return ret;
> -
> - return 0;
> + return i915_gem_open(dev, file);
> }
Seems to me the whole function could be replaced by a direct use of
i915_gem_open().
BR,
Jani.
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] drm: squash lines for simple wrapper functions
@ 2016-09-07 8:34 ` Jani Nikula
0 siblings, 0 replies; 11+ messages in thread
From: Jani Nikula @ 2016-09-07 8:34 UTC (permalink / raw)
To: David Airlie, dri-devel
Cc: Krzysztof Kozlowski, Masahiro Yamada, Huang Rui, Eric Huang,
Daniel Vetter, Flora Cui, Gustavo Padovan, Tom St Denis,
Dave Airlie, Dan Carpenter, intel-gfx, Tomasz Figa, Monk Liu,
linux-kernel, Samuel Li, Alex Deucher, Christian König,
Frediano Ziglio
On Wed, 07 Sep 2016, Masahiro Yamada <yamada.masahiro@socionext.com> wrote:
> Remove unneeded variables and assignments.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
...
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 95ddd56..59d029d 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1361,13 +1361,7 @@ void i915_driver_unload(struct drm_device *dev)
>
> static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
> {
> - int ret;
> -
> - ret = i915_gem_open(dev, file);
> - if (ret)
> - return ret;
> -
> - return 0;
> + return i915_gem_open(dev, file);
> }
Seems to me the whole function could be replaced by a direct use of
i915_gem_open().
BR,
Jani.
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* ✗ Fi.CI.BAT: warning for drm: squash lines for simple wrapper functions
2016-09-06 23:04 ` Masahiro Yamada
` (2 preceding siblings ...)
(?)
@ 2016-09-07 9:27 ` Patchwork
-1 siblings, 0 replies; 11+ messages in thread
From: Patchwork @ 2016-09-07 9:27 UTC (permalink / raw)
To: Masahiro Yamada; +Cc: intel-gfx
== Series Details ==
Series: drm: squash lines for simple wrapper functions
URL : https://patchwork.freedesktop.org/series/12096/
State : warning
== Summary ==
Series 12096v1 drm: squash lines for simple wrapper functions
http://patchwork.freedesktop.org/api/1.0/series/12096/revisions/1/mbox/
Test drv_module_reload_basic:
pass -> SKIP (fi-skl-6260u)
Test gem_exec_gttfill:
Subgroup basic:
pass -> SKIP (fi-snb-2600)
Test kms_pipe_crc_basic:
Subgroup nonblocking-crc-pipe-c:
pass -> SKIP (fi-hsw-4770r)
Subgroup suspend-read-crc-pipe-b:
pass -> SKIP (fi-hsw-4770k)
fi-bdw-5557u total:252 pass:233 dwarn:2 dfail:1 fail:1 skip:15
fi-bsw-n3050 total:252 pass:203 dwarn:1 dfail:1 fail:1 skip:46
fi-byt-n2820 total:252 pass:206 dwarn:2 dfail:1 fail:2 skip:41
fi-hsw-4770k total:252 pass:225 dwarn:2 dfail:1 fail:1 skip:23
fi-hsw-4770r total:252 pass:221 dwarn:2 dfail:1 fail:1 skip:27
fi-ivb-3520m total:252 pass:217 dwarn:2 dfail:1 fail:1 skip:31
fi-skl-6260u total:252 pass:233 dwarn:2 dfail:1 fail:1 skip:15
fi-skl-6700k total:252 pass:219 dwarn:3 dfail:1 fail:1 skip:28
fi-snb-2520m total:252 pass:204 dwarn:2 dfail:1 fail:2 skip:43
fi-snb-2600 total:252 pass:204 dwarn:2 dfail:1 fail:1 skip:44
Results at /archive/results/CI_IGT_test/Patchwork_2480/
980cf7a5d9c420afbaf52a339a2005339f9f8319 drm-intel-nightly: 2016y-09m-06d-18h-01m-33s UTC integration manifest
7c846de drm: squash lines for simple wrapper functions
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 11+ messages in thread
* RE: [PATCH] drm: squash lines for simple wrapper functions
2016-09-06 23:04 ` Masahiro Yamada
@ 2016-09-07 14:58 ` Deucher, Alexander
-1 siblings, 0 replies; 11+ messages in thread
From: Deucher, Alexander @ 2016-09-07 14:58 UTC (permalink / raw)
To: 'Masahiro Yamada', David Airlie, dri-devel
Cc: Gustavo Padovan, Yakir Yang, Huang, Ray, Liu, Monk, Zhou,
David(ChunMing),
Daniel Vetter, Heiko Stuebner, Huang, JinHuiEric, Cui, Flora,
Inki Dae, Krzysztof Kozlowski, Dave Airlie, Jani Nikula,
intel-gfx, Frediano Ziglio, Li, Samuel, Koenig, Christian,
Tomasz Figa, Sumit Semwal, linux-kernel, StDenis, Tom,
Dan Carpenter
> -----Original Message-----
> From: Masahiro Yamada [mailto:yamada.masahiro@socionext.com]
> Sent: Tuesday, September 06, 2016 7:04 PM
> To: David Airlie; dri-devel@lists.freedesktop.org
> Cc: Masahiro Yamada; Gustavo Padovan; Yakir Yang; Huang, Ray; Deucher,
> Alexander; Liu, Monk; Zhou, David(ChunMing); Daniel Vetter; Heiko
> Stuebner; Huang, JinHuiEric; Cui, Flora; Inki Dae; Krzysztof Kozlowski; Dave
> Airlie; Jani Nikula; intel-gfx@lists.freedesktop.org; Frediano Ziglio; Li, Samuel;
> Koenig, Christian; Tomasz Figa; Sumit Semwal; linux-kernel@vger.kernel.org;
> StDenis, Tom; Dan Carpenter
> Subject: [PATCH] drm: squash lines for simple wrapper functions
>
> Remove unneeded variables and assignments.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Please split these up per driver.
Alex
> ---
>
> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +-----
> drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 6 +-----
> drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 6 +-----
> drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 20 ++++----------------
> drivers/gpu/drm/drm_dp_mst_topology.c | 7 ++-----
> drivers/gpu/drm/i915/i915_drv.c | 8 +-------
> drivers/gpu/drm/qxl/qxl_draw.c | 7 ++-----
> drivers/gpu/drm/qxl/qxl_release.c | 7 ++-----
> drivers/gpu/drm/radeon/cik.c | 6 +-----
> drivers/gpu/drm/radeon/r100.c | 6 +-----
> drivers/gpu/drm/radeon/r600.c | 6 +-----
> 11 files changed, 17 insertions(+), 68 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> index b818461..0d5307a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> @@ -5854,11 +5854,7 @@ static int gfx_v8_0_set_clockgating_state(void
> *handle,
>
> static u32 gfx_v8_0_ring_get_rptr_gfx(struct amdgpu_ring *ring)
> {
> - u32 rptr;
> -
> - rptr = ring->adev->wb.wb[ring->rptr_offs];
> -
> - return rptr;
> + return ring->adev->wb.wb[ring->rptr_offs];
> }
>
> static u32 gfx_v8_0_ring_get_wptr_gfx(struct amdgpu_ring *ring)
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> index a64715d..b165c78 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> @@ -190,12 +190,8 @@ out:
> */
> static uint32_t sdma_v2_4_ring_get_rptr(struct amdgpu_ring *ring)
> {
> - u32 rptr;
> -
> /* XXX check if swapping is necessary on BE */
> - rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2;
> -
> - return rptr;
> + return ring->adev->wb.wb[ring->rptr_offs] >> 2;
> }
>
> /**
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> index 653ce5e..cf253b9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> @@ -335,12 +335,8 @@ out:
> */
> static uint32_t sdma_v3_0_ring_get_rptr(struct amdgpu_ring *ring)
> {
> - u32 rptr;
> -
> /* XXX check if swapping is necessary on BE */
> - rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2;
> -
> - return rptr;
> + return ring->adev->wb.wb[ring->rptr_offs] >> 2;
> }
>
> /**
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> index 48030f0..d37d112 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> @@ -1073,34 +1073,22 @@ void analogix_dp_set_lane3_link_training(struct
> analogix_dp_device *dp,
>
> u32 analogix_dp_get_lane0_link_training(struct analogix_dp_device *dp)
> {
> - u32 reg;
> -
> - reg = readl(dp->reg_base +
> ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
> - return reg;
> + return readl(dp->reg_base +
> ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
> }
>
> u32 analogix_dp_get_lane1_link_training(struct analogix_dp_device *dp)
> {
> - u32 reg;
> -
> - reg = readl(dp->reg_base +
> ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
> - return reg;
> + return readl(dp->reg_base +
> ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
> }
>
> u32 analogix_dp_get_lane2_link_training(struct analogix_dp_device *dp)
> {
> - u32 reg;
> -
> - reg = readl(dp->reg_base +
> ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
> - return reg;
> + return readl(dp->reg_base +
> ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
> }
>
> u32 analogix_dp_get_lane3_link_training(struct analogix_dp_device *dp)
> {
> - u32 reg;
> -
> - reg = readl(dp->reg_base +
> ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
> - return reg;
> + return readl(dp->reg_base +
> ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
> }
>
> void analogix_dp_reset_macro(struct analogix_dp_device *dp)
> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c
> b/drivers/gpu/drm/drm_dp_mst_topology.c
> index 04e4571..302bdcb 100644
> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> @@ -737,16 +737,13 @@ static void drm_dp_mst_put_payload_id(struct
> drm_dp_mst_topology_mgr *mgr,
> static bool check_txmsg_state(struct drm_dp_mst_topology_mgr *mgr,
> struct drm_dp_sideband_msg_tx *txmsg)
> {
> - bool ret;
> -
> /*
> * All updates to txmsg->state are protected by mgr->qlock, and the
> two
> * cases we check here are terminal states. For those the barriers
> * provided by the wake_up/wait_event pair are enough.
> */
> - ret = (txmsg->state == DRM_DP_SIDEBAND_TX_RX ||
> - txmsg->state == DRM_DP_SIDEBAND_TX_TIMEOUT);
> - return ret;
> + return txmsg->state == DRM_DP_SIDEBAND_TX_RX ||
> + txmsg->state == DRM_DP_SIDEBAND_TX_TIMEOUT;
> }
>
> static int drm_dp_mst_wait_tx_reply(struct drm_dp_mst_branch *mstb,
> diff --git a/drivers/gpu/drm/i915/i915_drv.c
> b/drivers/gpu/drm/i915/i915_drv.c
> index 95ddd56..59d029d 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1361,13 +1361,7 @@ void i915_driver_unload(struct drm_device *dev)
>
> static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
> {
> - int ret;
> -
> - ret = i915_gem_open(dev, file);
> - if (ret)
> - return ret;
> -
> - return 0;
> + return i915_gem_open(dev, file);
> }
>
> /**
> diff --git a/drivers/gpu/drm/qxl/qxl_draw.c
> b/drivers/gpu/drm/qxl/qxl_draw.c
> index ffe8853..9b728ed 100644
> --- a/drivers/gpu/drm/qxl/qxl_draw.c
> +++ b/drivers/gpu/drm/qxl/qxl_draw.c
> @@ -57,11 +57,8 @@ static struct qxl_rect *drawable_set_clipping(struct
> qxl_device *qdev,
> static int
> alloc_drawable(struct qxl_device *qdev, struct qxl_release **release)
> {
> - int ret;
> - ret = qxl_alloc_release_reserved(qdev, sizeof(struct qxl_drawable),
> - QXL_RELEASE_DRAWABLE, release,
> - NULL);
> - return ret;
> + return qxl_alloc_release_reserved(qdev, sizeof(struct
> qxl_drawable),
> + QXL_RELEASE_DRAWABLE, release,
> NULL);
> }
>
> static void
> diff --git a/drivers/gpu/drm/qxl/qxl_release.c
> b/drivers/gpu/drm/qxl/qxl_release.c
> index f599cd0..cd83f05 100644
> --- a/drivers/gpu/drm/qxl/qxl_release.c
> +++ b/drivers/gpu/drm/qxl/qxl_release.c
> @@ -203,12 +203,9 @@ qxl_release_free(struct qxl_device *qdev,
> static int qxl_release_bo_alloc(struct qxl_device *qdev,
> struct qxl_bo **bo)
> {
> - int ret;
> /* pin releases bo's they are too messy to evict */
> - ret = qxl_bo_create(qdev, PAGE_SIZE, false, true,
> - QXL_GEM_DOMAIN_VRAM, NULL,
> - bo);
> - return ret;
> + return qxl_bo_create(qdev, PAGE_SIZE, false, true,
> + QXL_GEM_DOMAIN_VRAM, NULL, bo);
> }
>
> int qxl_release_list_add(struct qxl_release *release, struct qxl_bo *bo)
> diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
> index 0c1b9ff..4da1140 100644
> --- a/drivers/gpu/drm/radeon/cik.c
> +++ b/drivers/gpu/drm/radeon/cik.c
> @@ -4201,11 +4201,7 @@ u32 cik_gfx_get_rptr(struct radeon_device *rdev,
> u32 cik_gfx_get_wptr(struct radeon_device *rdev,
> struct radeon_ring *ring)
> {
> - u32 wptr;
> -
> - wptr = RREG32(CP_RB0_WPTR);
> -
> - return wptr;
> + return RREG32(CP_RB0_WPTR);
> }
>
> void cik_gfx_set_wptr(struct radeon_device *rdev,
> diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
> index f25994b..f5e84f4 100644
> --- a/drivers/gpu/drm/radeon/r100.c
> +++ b/drivers/gpu/drm/radeon/r100.c
> @@ -1071,11 +1071,7 @@ u32 r100_gfx_get_rptr(struct radeon_device
> *rdev,
> u32 r100_gfx_get_wptr(struct radeon_device *rdev,
> struct radeon_ring *ring)
> {
> - u32 wptr;
> -
> - wptr = RREG32(RADEON_CP_RB_WPTR);
> -
> - return wptr;
> + return RREG32(RADEON_CP_RB_WPTR);
> }
>
> void r100_gfx_set_wptr(struct radeon_device *rdev,
> diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
> index 9247e7d..f034687 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -2631,11 +2631,7 @@ u32 r600_gfx_get_rptr(struct radeon_device
> *rdev,
> u32 r600_gfx_get_wptr(struct radeon_device *rdev,
> struct radeon_ring *ring)
> {
> - u32 wptr;
> -
> - wptr = RREG32(R600_CP_RB_WPTR);
> -
> - return wptr;
> + return RREG32(R600_CP_RB_WPTR);
> }
>
> void r600_gfx_set_wptr(struct radeon_device *rdev,
> --
> 1.9.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* RE: [PATCH] drm: squash lines for simple wrapper functions
@ 2016-09-07 14:58 ` Deucher, Alexander
0 siblings, 0 replies; 11+ messages in thread
From: Deucher, Alexander @ 2016-09-07 14:58 UTC (permalink / raw)
To: 'Masahiro Yamada', David Airlie, dri-devel
Cc: Krzysztof Kozlowski, Huang, Ray, Huang, JinHuiEric,
Daniel Vetter, Cui, Flora, Gustavo Padovan, StDenis, Tom,
Dave Airlie, Dan Carpenter, intel-gfx, Liu, Monk, linux-kernel,
Li, Samuel, Tomasz Figa, Koenig, Christian, Frediano Ziglio
> -----Original Message-----
> From: Masahiro Yamada [mailto:yamada.masahiro@socionext.com]
> Sent: Tuesday, September 06, 2016 7:04 PM
> To: David Airlie; dri-devel@lists.freedesktop.org
> Cc: Masahiro Yamada; Gustavo Padovan; Yakir Yang; Huang, Ray; Deucher,
> Alexander; Liu, Monk; Zhou, David(ChunMing); Daniel Vetter; Heiko
> Stuebner; Huang, JinHuiEric; Cui, Flora; Inki Dae; Krzysztof Kozlowski; Dave
> Airlie; Jani Nikula; intel-gfx@lists.freedesktop.org; Frediano Ziglio; Li, Samuel;
> Koenig, Christian; Tomasz Figa; Sumit Semwal; linux-kernel@vger.kernel.org;
> StDenis, Tom; Dan Carpenter
> Subject: [PATCH] drm: squash lines for simple wrapper functions
>
> Remove unneeded variables and assignments.
>
> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Please split these up per driver.
Alex
> ---
>
> drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 6 +-----
> drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 6 +-----
> drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 6 +-----
> drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 20 ++++----------------
> drivers/gpu/drm/drm_dp_mst_topology.c | 7 ++-----
> drivers/gpu/drm/i915/i915_drv.c | 8 +-------
> drivers/gpu/drm/qxl/qxl_draw.c | 7 ++-----
> drivers/gpu/drm/qxl/qxl_release.c | 7 ++-----
> drivers/gpu/drm/radeon/cik.c | 6 +-----
> drivers/gpu/drm/radeon/r100.c | 6 +-----
> drivers/gpu/drm/radeon/r600.c | 6 +-----
> 11 files changed, 17 insertions(+), 68 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> index b818461..0d5307a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
> @@ -5854,11 +5854,7 @@ static int gfx_v8_0_set_clockgating_state(void
> *handle,
>
> static u32 gfx_v8_0_ring_get_rptr_gfx(struct amdgpu_ring *ring)
> {
> - u32 rptr;
> -
> - rptr = ring->adev->wb.wb[ring->rptr_offs];
> -
> - return rptr;
> + return ring->adev->wb.wb[ring->rptr_offs];
> }
>
> static u32 gfx_v8_0_ring_get_wptr_gfx(struct amdgpu_ring *ring)
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> index a64715d..b165c78 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
> @@ -190,12 +190,8 @@ out:
> */
> static uint32_t sdma_v2_4_ring_get_rptr(struct amdgpu_ring *ring)
> {
> - u32 rptr;
> -
> /* XXX check if swapping is necessary on BE */
> - rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2;
> -
> - return rptr;
> + return ring->adev->wb.wb[ring->rptr_offs] >> 2;
> }
>
> /**
> diff --git a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> index 653ce5e..cf253b9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
> @@ -335,12 +335,8 @@ out:
> */
> static uint32_t sdma_v3_0_ring_get_rptr(struct amdgpu_ring *ring)
> {
> - u32 rptr;
> -
> /* XXX check if swapping is necessary on BE */
> - rptr = ring->adev->wb.wb[ring->rptr_offs] >> 2;
> -
> - return rptr;
> + return ring->adev->wb.wb[ring->rptr_offs] >> 2;
> }
>
> /**
> diff --git a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> index 48030f0..d37d112 100644
> --- a/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> +++ b/drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c
> @@ -1073,34 +1073,22 @@ void analogix_dp_set_lane3_link_training(struct
> analogix_dp_device *dp,
>
> u32 analogix_dp_get_lane0_link_training(struct analogix_dp_device *dp)
> {
> - u32 reg;
> -
> - reg = readl(dp->reg_base +
> ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
> - return reg;
> + return readl(dp->reg_base +
> ANALOGIX_DP_LN0_LINK_TRAINING_CTL);
> }
>
> u32 analogix_dp_get_lane1_link_training(struct analogix_dp_device *dp)
> {
> - u32 reg;
> -
> - reg = readl(dp->reg_base +
> ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
> - return reg;
> + return readl(dp->reg_base +
> ANALOGIX_DP_LN1_LINK_TRAINING_CTL);
> }
>
> u32 analogix_dp_get_lane2_link_training(struct analogix_dp_device *dp)
> {
> - u32 reg;
> -
> - reg = readl(dp->reg_base +
> ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
> - return reg;
> + return readl(dp->reg_base +
> ANALOGIX_DP_LN2_LINK_TRAINING_CTL);
> }
>
> u32 analogix_dp_get_lane3_link_training(struct analogix_dp_device *dp)
> {
> - u32 reg;
> -
> - reg = readl(dp->reg_base +
> ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
> - return reg;
> + return readl(dp->reg_base +
> ANALOGIX_DP_LN3_LINK_TRAINING_CTL);
> }
>
> void analogix_dp_reset_macro(struct analogix_dp_device *dp)
> diff --git a/drivers/gpu/drm/drm_dp_mst_topology.c
> b/drivers/gpu/drm/drm_dp_mst_topology.c
> index 04e4571..302bdcb 100644
> --- a/drivers/gpu/drm/drm_dp_mst_topology.c
> +++ b/drivers/gpu/drm/drm_dp_mst_topology.c
> @@ -737,16 +737,13 @@ static void drm_dp_mst_put_payload_id(struct
> drm_dp_mst_topology_mgr *mgr,
> static bool check_txmsg_state(struct drm_dp_mst_topology_mgr *mgr,
> struct drm_dp_sideband_msg_tx *txmsg)
> {
> - bool ret;
> -
> /*
> * All updates to txmsg->state are protected by mgr->qlock, and the
> two
> * cases we check here are terminal states. For those the barriers
> * provided by the wake_up/wait_event pair are enough.
> */
> - ret = (txmsg->state == DRM_DP_SIDEBAND_TX_RX ||
> - txmsg->state == DRM_DP_SIDEBAND_TX_TIMEOUT);
> - return ret;
> + return txmsg->state == DRM_DP_SIDEBAND_TX_RX ||
> + txmsg->state == DRM_DP_SIDEBAND_TX_TIMEOUT;
> }
>
> static int drm_dp_mst_wait_tx_reply(struct drm_dp_mst_branch *mstb,
> diff --git a/drivers/gpu/drm/i915/i915_drv.c
> b/drivers/gpu/drm/i915/i915_drv.c
> index 95ddd56..59d029d 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1361,13 +1361,7 @@ void i915_driver_unload(struct drm_device *dev)
>
> static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
> {
> - int ret;
> -
> - ret = i915_gem_open(dev, file);
> - if (ret)
> - return ret;
> -
> - return 0;
> + return i915_gem_open(dev, file);
> }
>
> /**
> diff --git a/drivers/gpu/drm/qxl/qxl_draw.c
> b/drivers/gpu/drm/qxl/qxl_draw.c
> index ffe8853..9b728ed 100644
> --- a/drivers/gpu/drm/qxl/qxl_draw.c
> +++ b/drivers/gpu/drm/qxl/qxl_draw.c
> @@ -57,11 +57,8 @@ static struct qxl_rect *drawable_set_clipping(struct
> qxl_device *qdev,
> static int
> alloc_drawable(struct qxl_device *qdev, struct qxl_release **release)
> {
> - int ret;
> - ret = qxl_alloc_release_reserved(qdev, sizeof(struct qxl_drawable),
> - QXL_RELEASE_DRAWABLE, release,
> - NULL);
> - return ret;
> + return qxl_alloc_release_reserved(qdev, sizeof(struct
> qxl_drawable),
> + QXL_RELEASE_DRAWABLE, release,
> NULL);
> }
>
> static void
> diff --git a/drivers/gpu/drm/qxl/qxl_release.c
> b/drivers/gpu/drm/qxl/qxl_release.c
> index f599cd0..cd83f05 100644
> --- a/drivers/gpu/drm/qxl/qxl_release.c
> +++ b/drivers/gpu/drm/qxl/qxl_release.c
> @@ -203,12 +203,9 @@ qxl_release_free(struct qxl_device *qdev,
> static int qxl_release_bo_alloc(struct qxl_device *qdev,
> struct qxl_bo **bo)
> {
> - int ret;
> /* pin releases bo's they are too messy to evict */
> - ret = qxl_bo_create(qdev, PAGE_SIZE, false, true,
> - QXL_GEM_DOMAIN_VRAM, NULL,
> - bo);
> - return ret;
> + return qxl_bo_create(qdev, PAGE_SIZE, false, true,
> + QXL_GEM_DOMAIN_VRAM, NULL, bo);
> }
>
> int qxl_release_list_add(struct qxl_release *release, struct qxl_bo *bo)
> diff --git a/drivers/gpu/drm/radeon/cik.c b/drivers/gpu/drm/radeon/cik.c
> index 0c1b9ff..4da1140 100644
> --- a/drivers/gpu/drm/radeon/cik.c
> +++ b/drivers/gpu/drm/radeon/cik.c
> @@ -4201,11 +4201,7 @@ u32 cik_gfx_get_rptr(struct radeon_device *rdev,
> u32 cik_gfx_get_wptr(struct radeon_device *rdev,
> struct radeon_ring *ring)
> {
> - u32 wptr;
> -
> - wptr = RREG32(CP_RB0_WPTR);
> -
> - return wptr;
> + return RREG32(CP_RB0_WPTR);
> }
>
> void cik_gfx_set_wptr(struct radeon_device *rdev,
> diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
> index f25994b..f5e84f4 100644
> --- a/drivers/gpu/drm/radeon/r100.c
> +++ b/drivers/gpu/drm/radeon/r100.c
> @@ -1071,11 +1071,7 @@ u32 r100_gfx_get_rptr(struct radeon_device
> *rdev,
> u32 r100_gfx_get_wptr(struct radeon_device *rdev,
> struct radeon_ring *ring)
> {
> - u32 wptr;
> -
> - wptr = RREG32(RADEON_CP_RB_WPTR);
> -
> - return wptr;
> + return RREG32(RADEON_CP_RB_WPTR);
> }
>
> void r100_gfx_set_wptr(struct radeon_device *rdev,
> diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
> index 9247e7d..f034687 100644
> --- a/drivers/gpu/drm/radeon/r600.c
> +++ b/drivers/gpu/drm/radeon/r600.c
> @@ -2631,11 +2631,7 @@ u32 r600_gfx_get_rptr(struct radeon_device
> *rdev,
> u32 r600_gfx_get_wptr(struct radeon_device *rdev,
> struct radeon_ring *ring)
> {
> - u32 wptr;
> -
> - wptr = RREG32(R600_CP_RB_WPTR);
> -
> - return wptr;
> + return RREG32(R600_CP_RB_WPTR);
> }
>
> void r600_gfx_set_wptr(struct radeon_device *rdev,
> --
> 1.9.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] drm: squash lines for simple wrapper functions
2016-09-07 8:34 ` Jani Nikula
@ 2016-09-07 15:09 ` Masahiro Yamada
-1 siblings, 0 replies; 11+ messages in thread
From: Masahiro Yamada @ 2016-09-07 15:09 UTC (permalink / raw)
To: Jani Nikula
Cc: David Airlie, dri-devel, Gustavo Padovan, Yakir Yang, Huang Rui,
Alex Deucher, Monk Liu, Chunming Zhou, Daniel Vetter,
Heiko Stuebner, Eric Huang, Flora Cui, Inki Dae,
Krzysztof Kozlowski, Dave Airlie, intel-gfx, Frediano Ziglio,
Samuel Li, Christian König, Tomasz Figa, Sumit Semwal,
Linux Kernel Mailing List, Tom St Denis, Dan Carpenter
Hi Jani,
2016-09-07 17:34 GMT+09:00 Jani Nikula <jani.nikula@linux.intel.com>:
> On Wed, 07 Sep 2016, Masahiro Yamada <yamada.masahiro@socionext.com> wrote:
>> Remove unneeded variables and assignments.
>>
>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>
> ...
>
>> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>> index 95ddd56..59d029d 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.c
>> +++ b/drivers/gpu/drm/i915/i915_drv.c
>> @@ -1361,13 +1361,7 @@ void i915_driver_unload(struct drm_device *dev)
>>
>> static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
>> {
>> - int ret;
>> -
>> - ret = i915_gem_open(dev, file);
>> - if (ret)
>> - return ret;
>> -
>> - return 0;
>> + return i915_gem_open(dev, file);
>> }
>
> Seems to me the whole function could be replaced by a direct use of
> i915_gem_open().
Good catch.
Shall I send v2?
Or, should it be done in a separate follow-up patch?
(I hope you can do it in this case.)
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH] drm: squash lines for simple wrapper functions
@ 2016-09-07 15:09 ` Masahiro Yamada
0 siblings, 0 replies; 11+ messages in thread
From: Masahiro Yamada @ 2016-09-07 15:09 UTC (permalink / raw)
To: Jani Nikula
Cc: David Airlie, dri-devel, Gustavo Padovan, Yakir Yang, Huang Rui,
Alex Deucher, Monk Liu, Chunming Zhou, Daniel Vetter,
Heiko Stuebner, Eric Huang, Flora Cui, Inki Dae,
Krzysztof Kozlowski, Dave Airlie, intel-gfx, Frediano Ziglio,
Samuel Li, Christian König, Tomasz Figa
Hi Jani,
2016-09-07 17:34 GMT+09:00 Jani Nikula <jani.nikula@linux.intel.com>:
> On Wed, 07 Sep 2016, Masahiro Yamada <yamada.masahiro@socionext.com> wrote:
>> Remove unneeded variables and assignments.
>>
>> Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
>
> ...
>
>> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>> index 95ddd56..59d029d 100644
>> --- a/drivers/gpu/drm/i915/i915_drv.c
>> +++ b/drivers/gpu/drm/i915/i915_drv.c
>> @@ -1361,13 +1361,7 @@ void i915_driver_unload(struct drm_device *dev)
>>
>> static int i915_driver_open(struct drm_device *dev, struct drm_file *file)
>> {
>> - int ret;
>> -
>> - ret = i915_gem_open(dev, file);
>> - if (ret)
>> - return ret;
>> -
>> - return 0;
>> + return i915_gem_open(dev, file);
>> }
>
> Seems to me the whole function could be replaced by a direct use of
> i915_gem_open().
Good catch.
Shall I send v2?
Or, should it be done in a separate follow-up patch?
(I hope you can do it in this case.)
--
Best Regards
Masahiro Yamada
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2016-09-07 15:31 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-09-06 23:04 [PATCH] drm: squash lines for simple wrapper functions Masahiro Yamada
2016-09-06 23:04 ` Masahiro Yamada
2016-09-07 7:16 ` Christian König
2016-09-07 7:16 ` Christian König
2016-09-07 8:34 ` Jani Nikula
2016-09-07 8:34 ` Jani Nikula
2016-09-07 15:09 ` Masahiro Yamada
2016-09-07 15:09 ` Masahiro Yamada
2016-09-07 9:27 ` ✗ Fi.CI.BAT: warning for " Patchwork
2016-09-07 14:58 ` [PATCH] " Deucher, Alexander
2016-09-07 14:58 ` Deucher, Alexander
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.