[FE training-materials-updates] kernel labs: fix indentation of code snippets
Michael Opdenacker
michael.opdenacker at free-electrons.com
Thu Jul 23 17:59:07 CEST 2015
Repository : git://git.free-electrons.com/training-materials.git
On branch : master
Link : http://git.free-electrons.com/training-materials/commit/?id=92ea1e60df6170abeeddd286f76077c89946b202
>---------------------------------------------------------------
commit 92ea1e60df6170abeeddd286f76077c89946b202
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date: Thu Jul 23 17:13:40 2015 +0200
kernel labs: fix indentation of code snippets
Signed-off-by: Michael Opdenacker <michael.opdenacker at free-electrons.com>
>---------------------------------------------------------------
92ea1e60df6170abeeddd286f76077c89946b202
labs/kernel-i2c-input-interface/device-pointers.c | 12 ++++++------
.../input-device-attributes.c | 10 +++++-----
.../kernel-i2c-input-interface/input-notification.c | 11 +++++------
.../kernel-i2c-input-interface.tex | 2 +-
.../kernel-i2c-input-interface/private-data-alloc.c | 10 +++++-----
labs/kernel-serial-iomem/kernel-serial-iomem.tex | 18 +++++++++---------
labs/kernel-serial-iomem/uart-line-init.c | 21 ++++++++++-----------
labs/kernel-serial-iomem/uart-line-reset.c | 7 +++----
8 files changed, 44 insertions(+), 47 deletions(-)
diff --git a/labs/kernel-i2c-input-interface/device-pointers.c b/labs/kernel-i2c-input-interface/device-pointers.c
index 74642dd..9e594da 100644
--- a/labs/kernel-i2c-input-interface/device-pointers.c
+++ b/labs/kernel-i2c-input-interface/device-pointers.c
@@ -1,6 +1,6 @@
- nunchuk->i2c_client = client;
- nunchuk->polled_input = polled_input;
- polled_input->private = nunchuk;
- i2c_set_clientdata(client, nunchuk);
- input = polled_input->input;
- input->dev.parent = &client->dev;
+nunchuk->i2c_client = client;
+nunchuk->polled_input = polled_input;
+polled_input->private = nunchuk;
+i2c_set_clientdata(client, nunchuk);
+input = polled_input->input;
+input->dev.parent = &client->dev;
diff --git a/labs/kernel-i2c-input-interface/input-device-attributes.c b/labs/kernel-i2c-input-interface/input-device-attributes.c
index b175058..8dea4e1 100644
--- a/labs/kernel-i2c-input-interface/input-device-attributes.c
+++ b/labs/kernel-i2c-input-interface/input-device-attributes.c
@@ -1,6 +1,6 @@
- input->name = "Wii Nunchuk";
- input->id.bustype = BUS_I2C;
+input->name = "Wii Nunchuk";
+input->id.bustype = BUS_I2C;
- set_bit(EV_KEY, input->evbit);
- set_bit(BTN_C, input->keybit);
- set_bit(BTN_Z, input->keybit);
+set_bit(EV_KEY, input->evbit);
+set_bit(BTN_C, input->keybit);
+set_bit(BTN_Z, input->keybit);
diff --git a/labs/kernel-i2c-input-interface/input-notification.c b/labs/kernel-i2c-input-interface/input-notification.c
index 4316a03..e11de43 100644
--- a/labs/kernel-i2c-input-interface/input-notification.c
+++ b/labs/kernel-i2c-input-interface/input-notification.c
@@ -1,6 +1,5 @@
- input_event(polled_input->input,
- EV_KEY, BTN_Z, zpressed);
- input_event(polled_input->input,
- EV_KEY, BTN_C, cpressed);
-
- input_sync(polled_input->input);
+input_event(polled_input->input,
+ EV_KEY, BTN_Z, zpressed);
+input_event(polled_input->input,
+ EV_KEY, BTN_C, cpressed);
+input_sync(polled_input->input);
diff --git a/labs/kernel-i2c-input-interface/kernel-i2c-input-interface.tex b/labs/kernel-i2c-input-interface/kernel-i2c-input-interface.tex
index b11633b..a2ef43e 100644
--- a/labs/kernel-i2c-input-interface/kernel-i2c-input-interface.tex
+++ b/labs/kernel-i2c-input-interface/kernel-i2c-input-interface.tex
@@ -113,7 +113,7 @@ Now, in your \code{probe()} routine, declare an instance of
this structure:
\begin{verbatim}
- struct nunchuk_dev *nunchuk;
+struct nunchuk_dev *nunchuk;
\end{verbatim}
Then allocate one such instead for each new device:
diff --git a/labs/kernel-i2c-input-interface/private-data-alloc.c b/labs/kernel-i2c-input-interface/private-data-alloc.c
index 8c54dff..ed3ce1c 100644
--- a/labs/kernel-i2c-input-interface/private-data-alloc.c
+++ b/labs/kernel-i2c-input-interface/private-data-alloc.c
@@ -1,5 +1,5 @@
- nunchuk = devm_kzalloc(&client->dev, sizeof(struct nunchuk_dev), GFP_KERNEL);
- if (!nunchuk) {
- dev_err(&client->dev, "Failed to allocate memory\n");
- return -ENOMEM;
- }
+nunchuk = devm_kzalloc(&client->dev, sizeof(struct nunchuk_dev), GFP_KERNEL);
+if (!nunchuk) {
+ dev_err(&client->dev, "Failed to allocate memory\n");
+ return -ENOMEM;
+}
diff --git a/labs/kernel-serial-iomem/kernel-serial-iomem.tex b/labs/kernel-serial-iomem/kernel-serial-iomem.tex
index 2d5ce6d..77fd062 100644
--- a/labs/kernel-serial-iomem/kernel-serial-iomem.tex
+++ b/labs/kernel-serial-iomem/kernel-serial-iomem.tex
@@ -149,12 +149,12 @@ You can now get a virtual address for your device's base physical
address, by calling:
\begin{verbatim}
- dev->regs = devm_ioremap_resource(&pdev->dev, res);
+dev->regs = devm_ioremap_resource(&pdev->dev, res);
- if (!dev->regs) {
- dev_err(&pdev->dev, "Cannot remap registers\n");
- return -ENOMEM;
- }
+if (!dev->regs) {
+ dev_err(&pdev->dev, "Cannot remap registers\n");
+ return -ENOMEM;
+}
\end{verbatim}
What's nice is that you won't ever have to release this resource,
@@ -190,7 +190,7 @@ the device base virtual address. The following code samples are using
the \code{writel()} convention of passing the value first, then the
offset. Your prototype should look like:
\begin{verbatim}
- static void reg_write(struct feserial_dev *dev, int val, int off);
+static void reg_write(struct feserial_dev *dev, int val, int off);
\end{verbatim}
We are now ready to read and write registers!
@@ -200,14 +200,14 @@ We are now ready to read and write registers!
Add the below lines to the probe function:
\begin{verbatim}
- pm_runtime_enable(&pdev->dev);
- pm_runtime_get_sync(&pdev->dev);
+pm_runtime_enable(&pdev->dev);
+pm_runtime_get_sync(&pdev->dev);
\end{verbatim}
And add the below line to the \code{remove()} routine:
\begin{verbatim}
- pm_runtime_disable(&pdev->dev);
+pm_runtime_disable(&pdev->dev);
\end{verbatim}
\subsection{Line and baud rate configuration}
diff --git a/labs/kernel-serial-iomem/uart-line-init.c b/labs/kernel-serial-iomem/uart-line-init.c
index c23f976..ae6bf24 100644
--- a/labs/kernel-serial-iomem/uart-line-init.c
+++ b/labs/kernel-serial-iomem/uart-line-init.c
@@ -1,12 +1,11 @@
- /* Configure the baud rate to 115200 */
-
- of_property_read_u32(pdev->dev.of_node, "clock-frequency",
- &uartclk);
- baud_divisor = uartclk / 16 / 115200;
- reg_write(dev, 0x07, UART_OMAP_MDR1);
- reg_write(dev, 0x00, UART_LCR);
- reg_write(dev, UART_LCR_DLAB, UART_LCR);
- reg_write(dev, baud_divisor & 0xff, UART_DLL);
- reg_write(dev, (baud_divisor >> 8) & 0xff, UART_DLM);
- reg_write(dev, UART_LCR_WLEN8, UART_LCR);
+/* Configure the baud rate to 115200 */
+of_property_read_u32(pdev->dev.of_node, "clock-frequency",
+ &uartclk);
+baud_divisor = uartclk / 16 / 115200;
+reg_write(dev, 0x07, UART_OMAP_MDR1);
+reg_write(dev, 0x00, UART_LCR);
+reg_write(dev, UART_LCR_DLAB, UART_LCR);
+reg_write(dev, baud_divisor & 0xff, UART_DLL);
+reg_write(dev, (baud_divisor >> 8) & 0xff, UART_DLM);
+reg_write(dev, UART_LCR_WLEN8, UART_LCR);
diff --git a/labs/kernel-serial-iomem/uart-line-reset.c b/labs/kernel-serial-iomem/uart-line-reset.c
index 63f5169..753bdd1 100644
--- a/labs/kernel-serial-iomem/uart-line-reset.c
+++ b/labs/kernel-serial-iomem/uart-line-reset.c
@@ -1,4 +1,3 @@
- /* Soft reset */
- reg_write(dev, UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT, UART_FCR);
- reg_write(dev, 0x00, UART_OMAP_MDR1);
-
+/* Soft reset */
+reg_write(dev, UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT, UART_FCR);
+reg_write(dev, 0x00, UART_OMAP_MDR1);
More information about the training-materials-updates
mailing list