@@ -175,6 +175,12 @@ static u32 gsi_channel_id(struct gsi_channel *channel)
175
175
return channel - & channel -> gsi -> channel [0 ];
176
176
}
177
177
178
+ /* An initialized channel has a non-null GSI pointer */
179
+ static bool gsi_channel_initialized (struct gsi_channel * channel )
180
+ {
181
+ return !!channel -> gsi ;
182
+ }
183
+
178
184
/* Update the GSI IRQ type register with the cached value */
179
185
static void gsi_irq_type_update (struct gsi * gsi , u32 val )
180
186
{
@@ -1638,8 +1644,8 @@ static int gsi_channel_setup_one(struct gsi *gsi, u32 channel_id)
1638
1644
u32 evt_ring_id = channel -> evt_ring_id ;
1639
1645
int ret ;
1640
1646
1641
- if (!channel -> gsi )
1642
- return 0 ; /* Ignore uninitialized channels */
1647
+ if (!gsi_channel_initialized ( channel ) )
1648
+ return 0 ;
1643
1649
1644
1650
ret = gsi_evt_ring_alloc_command (gsi , evt_ring_id );
1645
1651
if (ret )
@@ -1675,8 +1681,8 @@ static void gsi_channel_teardown_one(struct gsi *gsi, u32 channel_id)
1675
1681
struct gsi_channel * channel = & gsi -> channel [channel_id ];
1676
1682
u32 evt_ring_id = channel -> evt_ring_id ;
1677
1683
1678
- if (!channel -> gsi )
1679
- return ; /* Ignore uninitialized channels */
1684
+ if (!gsi_channel_initialized ( channel ) )
1685
+ return ;
1680
1686
1681
1687
netif_napi_del (& channel -> napi );
1682
1688
@@ -1770,8 +1776,8 @@ static int gsi_channel_setup(struct gsi *gsi)
1770
1776
while (channel_id < GSI_CHANNEL_COUNT_MAX ) {
1771
1777
struct gsi_channel * channel = & gsi -> channel [channel_id ++ ];
1772
1778
1773
- if (!channel -> gsi )
1774
- continue ; /* Ignore uninitialized channels */
1779
+ if (!gsi_channel_initialized ( channel ) )
1780
+ continue ;
1775
1781
1776
1782
ret = - EINVAL ;
1777
1783
dev_err (gsi -> dev , "channel %u not supported by hardware\n" ,
@@ -2089,8 +2095,8 @@ static int gsi_channel_init_one(struct gsi *gsi,
2089
2095
/* Inverse of gsi_channel_init_one() */
2090
2096
static void gsi_channel_exit_one (struct gsi_channel * channel )
2091
2097
{
2092
- if (!channel -> gsi )
2093
- return ; /* Ignore uninitialized channels */
2098
+ if (!gsi_channel_initialized ( channel ) )
2099
+ return ;
2094
2100
2095
2101
if (channel -> command )
2096
2102
ipa_cmd_pool_exit (channel );
0 commit comments