@@ -39,15 +39,15 @@ struct ath79_spi {
39
39
u32 reg_ctrl ;
40
40
void __iomem * base ;
41
41
struct clk * clk ;
42
- unsigned rrw_delay ;
42
+ unsigned int rrw_delay ;
43
43
};
44
44
45
- static inline u32 ath79_spi_rr (struct ath79_spi * sp , unsigned reg )
45
+ static inline u32 ath79_spi_rr (struct ath79_spi * sp , unsigned int reg )
46
46
{
47
47
return ioread32 (sp -> base + reg );
48
48
}
49
49
50
- static inline void ath79_spi_wr (struct ath79_spi * sp , unsigned reg , u32 val )
50
+ static inline void ath79_spi_wr (struct ath79_spi * sp , unsigned int reg , u32 val )
51
51
{
52
52
iowrite32 (val , sp -> base + reg );
53
53
}
@@ -57,7 +57,7 @@ static inline struct ath79_spi *ath79_spidev_to_sp(struct spi_device *spi)
57
57
return spi_master_get_devdata (spi -> master );
58
58
}
59
59
60
- static inline void ath79_spi_delay (struct ath79_spi * sp , unsigned nsecs )
60
+ static inline void ath79_spi_delay (struct ath79_spi * sp , unsigned int nsecs )
61
61
{
62
62
if (nsecs > sp -> rrw_delay )
63
63
ndelay (nsecs - sp -> rrw_delay );
@@ -148,9 +148,8 @@ static int ath79_spi_setup_cs(struct spi_device *spi)
148
148
149
149
static void ath79_spi_cleanup_cs (struct spi_device * spi )
150
150
{
151
- if (gpio_is_valid (spi -> cs_gpio )) {
151
+ if (gpio_is_valid (spi -> cs_gpio ))
152
152
gpio_free (spi -> cs_gpio );
153
- }
154
153
}
155
154
156
155
static int ath79_spi_setup (struct spi_device * spi )
@@ -176,7 +175,7 @@ static void ath79_spi_cleanup(struct spi_device *spi)
176
175
spi_bitbang_cleanup (spi );
177
176
}
178
177
179
- static u32 ath79_spi_txrx_mode0 (struct spi_device * spi , unsigned nsecs ,
178
+ static u32 ath79_spi_txrx_mode0 (struct spi_device * spi , unsigned int nsecs ,
180
179
u32 word , u8 bits )
181
180
{
182
181
struct ath79_spi * sp = ath79_spidev_to_sp (spi );
0 commit comments