Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit aadc5e67eeff3bea9a5f0fc5bfe8ccb0e7d4adae

Authored by Mario Six
Committed by Tom Rini
1 parent f62ca2cd2a
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

gpio: mpc85xx_gpio: Fix style violations 

Fix some style violations in the MPC85XX GPIO driver.

Signed-off-by: Mario Six <mario.six@gdsys.cc>

Showing 1 changed file with 22 additions and 20 deletions Side-by-side Diff

drivers/gpio/mpc85xx_gpio.c
Diff comments   View file @ aadc5e6
... ... @@ -34,11 +34,13 @@
34 34 uint gpio_count;
35 35 /* The GPDAT register cannot be used to determine the value of output
36 36 * pins on MPC8572/MPC8536, so we shadow it and use the shadowed value
37   - * for output pins */
  37 + * for output pins
  38 + */
38 39 u32 dat_shadow;
39 40 };
40 41  
41   -inline u32 gpio_mask(unsigned gpio) {
  42 +inline u32 gpio_mask(uint gpio)
  43 +{
42 44 return (1U << (31 - (gpio)));
43 45 }
44 46  
... ... @@ -92,7 +94,7 @@
92 94 clrbits_be32(&base->gpodr, gpios);
93 95 }
94 96  
95   -static int mpc85xx_gpio_direction_input(struct udevice *dev, unsigned gpio)
  97 +static int mpc85xx_gpio_direction_input(struct udevice *dev, uint gpio)
96 98 {
97 99 struct mpc85xx_gpio_data *data = dev_get_priv(dev);
98 100  
... ... @@ -100,8 +102,7 @@
100 102 return 0;
101 103 }
102 104  
103   -static int mpc85xx_gpio_set_value(struct udevice *dev, unsigned gpio,
104   - int value)
  105 +static int mpc85xx_gpio_set_value(struct udevice *dev, uint gpio, int value)
105 106 {
106 107 struct mpc85xx_gpio_data *data = dev_get_priv(dev);
107 108  
108 109  
109 110  
110 111  
111 112  
112 113  
113 114  
114 115  
115 116  
116 117  
... ... @@ -115,46 +116,46 @@
115 116 return 0;
116 117 }
117 118  
118   -static int mpc85xx_gpio_direction_output(struct udevice *dev, unsigned gpio,
  119 +static int mpc85xx_gpio_direction_output(struct udevice *dev, uint gpio,
119 120 int value)
120 121 {
121 122 return mpc85xx_gpio_set_value(dev, gpio, value);
122 123 }
123 124  
124   -static int mpc85xx_gpio_get_value(struct udevice *dev, unsigned gpio)
  125 +static int mpc85xx_gpio_get_value(struct udevice *dev, uint gpio)
125 126 {
126 127 struct mpc85xx_gpio_data *data = dev_get_priv(dev);
127 128  
128 129 if (!!mpc85xx_gpio_get_dir(data->base, gpio_mask(gpio))) {
129 130 /* Output -> use shadowed value */
130 131 return !!(data->dat_shadow & gpio_mask(gpio));
131   - } else {
132   - /* Input -> read value from GPDAT register */
133   - return !!mpc85xx_gpio_get_val(data->base, gpio_mask(gpio));
134 132 }
  133 +
  134 + /* Input -> read value from GPDAT register */
  135 + return !!mpc85xx_gpio_get_val(data->base, gpio_mask(gpio));
135 136 }
136 137  
137   -static int mpc85xx_gpio_get_open_drain(struct udevice *dev, unsigned gpio)
  138 +static int mpc85xx_gpio_get_open_drain(struct udevice *dev, uint gpio)
138 139 {
139 140 struct mpc85xx_gpio_data *data = dev_get_priv(dev);
140 141  
141 142 return !!mpc85xx_gpio_open_drain_val(data->base, gpio_mask(gpio));
142 143 }
143 144  
144   -static int mpc85xx_gpio_set_open_drain(struct udevice *dev, unsigned gpio,
  145 +static int mpc85xx_gpio_set_open_drain(struct udevice *dev, uint gpio,
145 146 int value)
146 147 {
147 148 struct mpc85xx_gpio_data *data = dev_get_priv(dev);
148 149  
149   - if (value) {
  150 + if (value)
150 151 mpc85xx_gpio_open_drain_on(data->base, gpio_mask(gpio));
151   - } else {
  152 + else
152 153 mpc85xx_gpio_open_drain_off(data->base, gpio_mask(gpio));
153   - }
  154 +
154 155 return 0;
155 156 }
156 157  
157   -static int mpc85xx_gpio_get_function(struct udevice *dev, unsigned gpio)
  158 +static int mpc85xx_gpio_get_function(struct udevice *dev, uint gpio)
158 159 {
159 160 struct mpc85xx_gpio_data *data = dev_get_priv(dev);
160 161 int dir;
161 162  
... ... @@ -164,14 +165,15 @@
164 165 }
165 166  
166 167 #if CONFIG_IS_ENABLED(OF_CONTROL)
167   -static int mpc85xx_gpio_ofdata_to_platdata(struct udevice *dev) {
  168 +static int mpc85xx_gpio_ofdata_to_platdata(struct udevice *dev)
  169 +{
168 170 struct mpc85xx_gpio_plat *plat = dev_get_platdata(dev);
169 171 fdt_addr_t addr;
170 172 fdt_size_t size;
171 173  
172 174 addr = fdtdec_get_addr_size_auto_noparent(gd->fdt_blob,
173   - dev_of_offset(dev), "reg", 0, &size, false);
174   -
  175 + dev_of_offset(dev),
  176 + "reg", 0, &size, false);
175 177 plat->addr = addr;
176 178 plat->size = size;
177 179 plat->ngpios = fdtdec_get_int(gd->fdt_blob, dev_of_offset(dev),
... ... @@ -229,7 +231,7 @@
229 231 .set_value = mpc85xx_gpio_set_value,
230 232 .get_open_drain = mpc85xx_gpio_get_open_drain,
231 233 .set_open_drain = mpc85xx_gpio_set_open_drain,
232   - .get_function = mpc85xx_gpio_get_function,
  234 + .get_function = mpc85xx_gpio_get_function,
233 235 };
234 236  
235 237 static const struct udevice_id mpc85xx_gpio_ids[] = {