[PATCH 1/2] [media] Remove checks of struct member addresses
This removes checks of struct member addresses since they likely result
in the condition always being true. Also in the stb6100_get_bandwidth
and tda8261_get_bandwidth functions the pointers frontend_ops and
tuner_ops are assigned the same addresses twice.
Signed-off-by: Emil Goode
---
drivers/media/dvb-frontends/stb6100_cfg.h | 30 +++-
drivers/media/dvb-frontends/stb6100_proc.h | 34
drivers/media/dvb-frontends/stv0367.c |9 ++--
drivers/media/dvb-frontends/tda8261_cfg.h | 21 -
4 files changed, 25 insertions(+), 69 deletions(-)
diff --git a/drivers/media/dvb-frontends/stb6100_cfg.h
b/drivers/media/dvb-frontends/stb6100_cfg.h
index 6314d18..0e10ad89 100644
--- a/drivers/media/dvb-frontends/stb6100_cfg.h
+++ b/drivers/media/dvb-frontends/stb6100_cfg.h
@@ -21,15 +21,11 @@
static int stb6100_get_frequency(struct dvb_frontend *fe, u32 *frequency)
{
- struct dvb_frontend_ops *frontend_ops = NULL;
- struct dvb_tuner_ops*tuner_ops = NULL;
+ struct dvb_frontend_ops *frontend_ops = >ops;
+ struct dvb_tuner_ops*tuner_ops = _ops->tuner_ops;
struct tuner_state t_state;
int err = 0;
- if (>ops)
- frontend_ops = >ops;
- if (_ops->tuner_ops)
- tuner_ops = _ops->tuner_ops;
if (tuner_ops->get_state) {
if ((err = tuner_ops->get_state(fe, DVBFE_TUNER_FREQUENCY,
_state)) < 0) {
printk("%s: Invalid parameter\n", __func__);
@@ -42,16 +38,13 @@ static int stb6100_get_frequency(struct dvb_frontend *fe,
u32 *frequency)
static int stb6100_set_frequency(struct dvb_frontend *fe, u32 frequency)
{
- struct dvb_frontend_ops *frontend_ops = NULL;
- struct dvb_tuner_ops*tuner_ops = NULL;
+ struct dvb_frontend_ops *frontend_ops = >ops;
+ struct dvb_tuner_ops*tuner_ops = _ops->tuner_ops;
struct tuner_state t_state;
int err = 0;
t_state.frequency = frequency;
- if (>ops)
- frontend_ops = >ops;
- if (_ops->tuner_ops)
- tuner_ops = _ops->tuner_ops;
+
if (tuner_ops->set_state) {
if ((err = tuner_ops->set_state(fe, DVBFE_TUNER_FREQUENCY,
_state)) < 0) {
printk("%s: Invalid parameter\n", __func__);
@@ -68,10 +61,6 @@ static int stb6100_get_bandwidth(struct dvb_frontend *fe,
u32 *bandwidth)
struct tuner_state t_state;
int err = 0;
- if (>ops)
- frontend_ops = >ops;
- if (_ops->tuner_ops)
- tuner_ops = _ops->tuner_ops;
if (tuner_ops->get_state) {
if ((err = tuner_ops->get_state(fe, DVBFE_TUNER_BANDWIDTH,
_state)) < 0) {
printk("%s: Invalid parameter\n", __func__);
@@ -84,16 +73,13 @@ static int stb6100_get_bandwidth(struct dvb_frontend *fe,
u32 *bandwidth)
static int stb6100_set_bandwidth(struct dvb_frontend *fe, u32 bandwidth)
{
- struct dvb_frontend_ops *frontend_ops = NULL;
- struct dvb_tuner_ops*tuner_ops = NULL;
+ struct dvb_frontend_ops *frontend_ops = >ops;
+ struct dvb_tuner_ops*tuner_ops = _ops->tuner_ops;
struct tuner_state t_state;
int err = 0;
t_state.bandwidth = bandwidth;
- if (>ops)
- frontend_ops = >ops;
- if (_ops->tuner_ops)
- tuner_ops = _ops->tuner_ops;
+
if (tuner_ops->set_state) {
if ((err = tuner_ops->set_state(fe, DVBFE_TUNER_BANDWIDTH,
_state)) < 0) {
printk("%s: Invalid parameter\n", __func__);
diff --git a/drivers/media/dvb-frontends/stb6100_proc.h
b/drivers/media/dvb-frontends/stb6100_proc.h
index 112163a..bd8a0ec 100644
--- a/drivers/media/dvb-frontends/stb6100_proc.h
+++ b/drivers/media/dvb-frontends/stb6100_proc.h
@@ -19,15 +19,11 @@
static int stb6100_get_freq(struct dvb_frontend *fe, u32 *frequency)
{
- struct dvb_frontend_ops *frontend_ops = NULL;
- struct dvb_tuner_ops*tuner_ops = NULL;
+ struct dvb_frontend_ops *frontend_ops = >ops;
+ struct dvb_tuner_ops*tuner_ops = _ops->tuner_ops;
struct tuner_state state;
int err = 0;
- if (>ops)
- frontend_ops = >ops;
- if (_ops->tuner_ops)
- tuner_ops = _ops->tuner_ops;
if (tuner_ops->get_state) {
if (frontend_ops->i2c_gate_ctrl)
frontend_ops->i2c_gate_ctrl(fe, 1);
@@ -49,16 +45,13 @@ static int stb6100_get_freq(struct dvb_frontend *fe, u32
*frequency)
static int stb6100_set_freq(struct dvb_frontend *fe, u32 frequency)
{
- struct dvb_frontend_ops *frontend_ops = NULL;
- struct dvb_tuner_ops*tuner_ops = NULL;
+ struct dvb_frontend_ops *frontend_ops = >ops;
+ struct dvb_tuner_ops*tuner_ops = _ops->tuner_ops;
struct tuner_state
[PATCH 1/2] [media] Remove checks of struct member addresses
This removes checks of struct member addresses since they likely result
in the condition always being true. Also in the stb6100_get_bandwidth
and tda8261_get_bandwidth functions the pointers frontend_ops and
tuner_ops are assigned the same addresses twice.
Signed-off-by: Emil Goode emilgo...@gmail.com
---
drivers/media/dvb-frontends/stb6100_cfg.h | 30 +++-
drivers/media/dvb-frontends/stb6100_proc.h | 34
drivers/media/dvb-frontends/stv0367.c |9 ++--
drivers/media/dvb-frontends/tda8261_cfg.h | 21 -
4 files changed, 25 insertions(+), 69 deletions(-)
diff --git a/drivers/media/dvb-frontends/stb6100_cfg.h
b/drivers/media/dvb-frontends/stb6100_cfg.h
index 6314d18..0e10ad89 100644
--- a/drivers/media/dvb-frontends/stb6100_cfg.h
+++ b/drivers/media/dvb-frontends/stb6100_cfg.h
@@ -21,15 +21,11 @@
static int stb6100_get_frequency(struct dvb_frontend *fe, u32 *frequency)
{
- struct dvb_frontend_ops *frontend_ops = NULL;
- struct dvb_tuner_ops*tuner_ops = NULL;
+ struct dvb_frontend_ops *frontend_ops = fe-ops;
+ struct dvb_tuner_ops*tuner_ops = frontend_ops-tuner_ops;
struct tuner_state t_state;
int err = 0;
- if (fe-ops)
- frontend_ops = fe-ops;
- if (frontend_ops-tuner_ops)
- tuner_ops = frontend_ops-tuner_ops;
if (tuner_ops-get_state) {
if ((err = tuner_ops-get_state(fe, DVBFE_TUNER_FREQUENCY,
t_state)) 0) {
printk(%s: Invalid parameter\n, __func__);
@@ -42,16 +38,13 @@ static int stb6100_get_frequency(struct dvb_frontend *fe,
u32 *frequency)
static int stb6100_set_frequency(struct dvb_frontend *fe, u32 frequency)
{
- struct dvb_frontend_ops *frontend_ops = NULL;
- struct dvb_tuner_ops*tuner_ops = NULL;
+ struct dvb_frontend_ops *frontend_ops = fe-ops;
+ struct dvb_tuner_ops*tuner_ops = frontend_ops-tuner_ops;
struct tuner_state t_state;
int err = 0;
t_state.frequency = frequency;
- if (fe-ops)
- frontend_ops = fe-ops;
- if (frontend_ops-tuner_ops)
- tuner_ops = frontend_ops-tuner_ops;
+
if (tuner_ops-set_state) {
if ((err = tuner_ops-set_state(fe, DVBFE_TUNER_FREQUENCY,
t_state)) 0) {
printk(%s: Invalid parameter\n, __func__);
@@ -68,10 +61,6 @@ static int stb6100_get_bandwidth(struct dvb_frontend *fe,
u32 *bandwidth)
struct tuner_state t_state;
int err = 0;
- if (fe-ops)
- frontend_ops = fe-ops;
- if (frontend_ops-tuner_ops)
- tuner_ops = frontend_ops-tuner_ops;
if (tuner_ops-get_state) {
if ((err = tuner_ops-get_state(fe, DVBFE_TUNER_BANDWIDTH,
t_state)) 0) {
printk(%s: Invalid parameter\n, __func__);
@@ -84,16 +73,13 @@ static int stb6100_get_bandwidth(struct dvb_frontend *fe,
u32 *bandwidth)
static int stb6100_set_bandwidth(struct dvb_frontend *fe, u32 bandwidth)
{
- struct dvb_frontend_ops *frontend_ops = NULL;
- struct dvb_tuner_ops*tuner_ops = NULL;
+ struct dvb_frontend_ops *frontend_ops = fe-ops;
+ struct dvb_tuner_ops*tuner_ops = frontend_ops-tuner_ops;
struct tuner_state t_state;
int err = 0;
t_state.bandwidth = bandwidth;
- if (fe-ops)
- frontend_ops = fe-ops;
- if (frontend_ops-tuner_ops)
- tuner_ops = frontend_ops-tuner_ops;
+
if (tuner_ops-set_state) {
if ((err = tuner_ops-set_state(fe, DVBFE_TUNER_BANDWIDTH,
t_state)) 0) {
printk(%s: Invalid parameter\n, __func__);
diff --git a/drivers/media/dvb-frontends/stb6100_proc.h
b/drivers/media/dvb-frontends/stb6100_proc.h
index 112163a..bd8a0ec 100644
--- a/drivers/media/dvb-frontends/stb6100_proc.h
+++ b/drivers/media/dvb-frontends/stb6100_proc.h
@@ -19,15 +19,11 @@
static int stb6100_get_freq(struct dvb_frontend *fe, u32 *frequency)
{
- struct dvb_frontend_ops *frontend_ops = NULL;
- struct dvb_tuner_ops*tuner_ops = NULL;
+ struct dvb_frontend_ops *frontend_ops = fe-ops;
+ struct dvb_tuner_ops*tuner_ops = frontend_ops-tuner_ops;
struct tuner_state state;
int err = 0;
- if (fe-ops)
- frontend_ops = fe-ops;
- if (frontend_ops-tuner_ops)
- tuner_ops = frontend_ops-tuner_ops;
if (tuner_ops-get_state) {
if (frontend_ops-i2c_gate_ctrl)
frontend_ops-i2c_gate_ctrl(fe, 1);
@@ -49,16 +45,13 @@ static int stb6100_get_freq(struct dvb_frontend *fe, u32
*frequency)
static int stb6100_set_freq(struct dvb_frontend *fe, u32 frequency)
{
- struct dvb_frontend_ops *frontend_ops = NULL;
- struct dvb_tuner_ops*tuner_ops = NULL;
+ struct
