ice: minor cleanings
Subsystems (2)
cover ice: minor cleanings
Make a couple of quick cleanups to the GNSS code, resulting in a little less code and a little more readability.
Jesse Brandeburg (2):
ice: refactor code to remove unused variable
ice: trivial: normalize strings
drivers/net/ethernet/intel/ice/ice_gnss.c | 9 ++++----- drivers/net/ethernet/intel/ice/ice_gnss.h | 1 - 2 files changed, 4 insertions(+), 6 deletions(-)
base-commit: 8e5db4d73415c64d07aa7ca7743c4a2882c8979b
Signature · 6 lines
2.41.0 _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
PATCH 1/2 ice: refactor code to remove unused variable
Upon review it was noticed that there is an unused local variable that is using another unused define. Remove all the unused stuff from the function and header in question.
--- drivers/net/ethernet/intel/ice/ice_gnss.c | 5 ++--- drivers/net/ethernet/intel/ice/ice_gnss.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/net/ethernet/intel/ice/ice_gnss.c +2 -3
@@ -85,7 +85,6 @@ static void ice_gnss_read(struct kthread_work *work) { struct gnss_serial *gnss = container_of(work, struct gnss_serial, read_work.work); -unsigned long delay =ICE_GNSS_POLL_DATA_DELAY_TIME ;unsigned int i, bytes_read, data_len, count;struct ice_aqc_link_topo_addr link_topo;struct ice_pf *pf;
@@ -149,11 +148,11 @@ static void ice_gnss_read(struct kthread_work *work)dev_warn (ice_pf_to_dev (pf),"gnss_insert_raw ret=%d size=%d\n" , count, i); - delay =ICE_GNSS_TIMER_DELAY_TIME ; free_buf:free_page ((unsigned long )buf); requeue: -kthread_queue_delayed_work (gnss->kworker, &gnss->read_work, delay); +kthread_queue_delayed_work (gnss->kworker, &gnss->read_work, +ICE_GNSS_TIMER_DELAY_TIME );if (err)dev_dbg (ice_pf_to_dev (pf),"GNSS failed to read err=%d\n" , err); }
drivers/net/ethernet/intel/ice/ice_gnss.h +0 -1
@@ -5,7 +5,6 @@#define _ICE_GNSS_H_#define ICE_E810T_GNSS_I2C_BUS 0x2 -#define ICE_GNSS_POLL_DATA_DELAY_TIME (HZ / 50)/* poll every 20 ms */ #define ICE_GNSS_TIMER_DELAY_TIME (HZ / 10)/* 0.1 second per message */ #define ICE_GNSS_TTY_WRITE_BUF 250#define ICE_MAX_I2C_DATA_SIZE FIELD_MAX(ICE_AQC_I2C_DATA_SIZE_M)
Signature · 6 lines
2.41.0 _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Re: [Intel-wired-lan] [PATCH iwl-next v1 1/2] ice: refactor code to remove unused variable
Quoted 41 lines · Jesse Brandeburg
Upon review it was noticed that there is an unused local variable that is using another unused define. Remove all the unused stuff from the function and header in question.
Signed-off-by Jesse Brandeburg <[email protected]>--- drivers/net/ethernet/intel/ice/ice_gnss.c | 5 ++--- drivers/net/ethernet/intel/ice/ice_gnss.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-)drivers/net/ethernet/intel/ice/ice_gnss.c +2
-3@@ -85,7 +85,6 @@ static void ice_gnss_read(struct kthread_work *work) { struct gnss_serial *gnss = container_of(work, struct gnss_serial, read_work.work); -unsigned long delay =ICE_GNSS_POLL_DATA_DELAY_TIME ;unsigned int i, bytes_read, data_len, count;struct ice_aqc_link_topo_addr link_topo;struct ice_pf *pf;@@ -149,11 +148,11 @@ static void ice_gnss_read(struct kthread_work *work)dev_warn (ice_pf_to_dev (pf),"gnss_insert_raw ret=%d size=%d\n" , count, i); - delay =ICE_GNSS_TIMER_DELAY_TIME ; free_buf:free_page ((unsigned long )buf); requeue: -kthread_queue_delayed_work (gnss->kworker, &gnss->read_work, delay); +kthread_queue_delayed_work (gnss->kworker, &gnss->read_work, +ICE_GNSS_TIMER_DELAY_TIME );if (err)dev_dbg (ice_pf_to_dev (pf),"GNSS failed to read err=%d\n" , err); }drivers/net/ethernet/intel/ice/ice_gnss.h +0
-0
drivers/net/ethernet/intel/ice/ice_gnss.h line 10
Quoted 7 lines
drivers/net/ethernet/intel/ice/ice_gnss.h +0
-1@@ -5,7 +5,6 @@#define _ICE_GNSS_H_#define ICE_E810T_GNSS_I2C_BUS 0x2 -#define ICE_GNSS_POLL_DATA_DELAY_TIME (HZ / 50)/* poll every 20 ms */ #define ICE_GNSS_TIMER_DELAY_TIME (HZ / 10)/* 0.1 second per message */ #define ICE_GNSS_TTY_WRITE_BUF 250#define ICE_MAX_I2C_DATA_SIZE FIELD_MAX(ICE_AQC_I2C_DATA_SIZE_M)
_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
Re: [Intel-wired-lan] [PATCH iwl-next v1 1/2] ice: refactor code to remove unused variable
In reply to Jesse BrandeburgQuoted 16 lines · Jesse Brandeburg
Upon review it was noticed that there is an unused local variable that is using another unused define. Remove all the unused stuff from the function and header in question.
Signed-off-by Jesse Brandeburg <[email protected]>--- drivers/net/ethernet/intel/ice/ice_gnss.c | 5 ++--- drivers/net/ethernet/intel/ice/ice_gnss.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-)drivers/net/ethernet/intel/ice/ice_gnss.c +0
-0
drivers/net/ethernet/intel/ice/ice_gnss.c static void ice_gnss_read(struct kthread_work *work) · line 88
Quoted 4 lines
drivers/net/ethernet/intel/ice/ice_gnss.c +0
-1@@ -85,7 +85,6 @@ static void ice_gnss_read(struct kthread_work *work) { struct gnss_serial *gnss = container_of(work, struct gnss_serial, read_work.work); -unsigned long delay =ICE_GNSS_POLL_DATA_DELAY_TIME ;
This is a different value than the one you are using in the kthread... call below. The logic has some jumps to the requeue label that would be using this POLL_DATA_DELAY value. With your change, these jumps will now be using the TIMER_DELAY value. Is this a significant change in behavior?
sln
Quoted 32 lines
drivers/net/ethernet/intel/ice/ice_gnss.c +2
-2unsigned int i, bytes_read, data_len, count;struct ice_aqc_link_topo_addr link_topo;struct ice_pf *pf;@@ -149,11 +148,11 @@ static void ice_gnss_read(struct kthread_work *work)dev_warn (ice_pf_to_dev (pf),"gnss_insert_raw ret=%d size=%d\n" , count, i); - delay =ICE_GNSS_TIMER_DELAY_TIME ; free_buf:free_page ((unsigned long )buf); requeue: -kthread_queue_delayed_work (gnss->kworker, &gnss->read_work, delay); +kthread_queue_delayed_work (gnss->kworker, &gnss->read_work, +ICE_GNSS_TIMER_DELAY_TIME );if (err)dev_dbg (ice_pf_to_dev (pf),"GNSS failed to read err=%d\n" , err); }drivers/net/ethernet/intel/ice/ice_gnss.h +0
-2@@ -5,7 +5,6 @@#define _ICE_GNSS_H_#define ICE_E810T_GNSS_I2C_BUS 0x2 -#define ICE_GNSS_POLL_DATA_DELAY_TIME (HZ / 50)/* poll every 20 ms */ #define ICE_GNSS_TIMER_DELAY_TIME (HZ / 10)/* 0.1 second per message */ #define ICE_GNSS_TTY_WRITE_BUF 250#define ICE_MAX_I2C_DATA_SIZE FIELD_MAX(ICE_AQC_I2C_DATA_SIZE_M) --2.41.0
Quoted 4 lines
_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
_______________________________________________
Intel-wired-lan mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
PATCH 2/2 ice: trivial: normalize strings
In reply to Jesse BrandeburgWhile reviewing this code I noticed two strings being printed from the driver that are reporting status, but calling it err=, so fix up those messages. This better matches other locations in the driver where we call that type of return value print "status=".
--- drivers/net/ethernet/intel/ice/ice_gnss.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ice/ice_gnss.c +2 -2
@@ -69,7 +69,7 @@ ice_gnss_do_write(struct ice_pf *pf, const unsigned char *buf, unsigned int sizereturn size; err_out: -dev_err (ice_pf_to_dev (pf),"GNSS failed to write, offset=%u, size=%u, err=%d\n" , +dev_err (ice_pf_to_dev (pf),"GNSS failed to write, offset=%u, size=%u, status=%d\n" , offset, size, err);return err;
@@ -310,7 +310,7 @@ static int ice_gnss_register(struct ice_pf *pf)gnss_set_drvdata (gdev, pf); ret =gnss_register_device (gdev);if (ret) { -dev_err (ice_pf_to_dev (pf),"gnss_register_device err=%d\n" , +dev_err (ice_pf_to_dev (pf),"gnss_register_device failed, status=%d\n" , ret);gnss_put_device (gdev); }else {
Signature · 6 lines
2.41.0 _______________________________________________ Intel-wired-lan mailing list [email protected] https://lists.osuosl.org/mailman/listinfo/intel-wired-lan