diff options
| author | Gulsah Kose <gulsah.1004@gmail.com> | 2014-09-20 18:06:55 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-09-19 20:39:45 -0400 |
| commit | a17ec4c9fd07d3f4760cc6545b54f8323ea6ccb4 (patch) | |
| tree | 85041d9aae6c7436ed3c0bfc58dcf29ceda52e08 | |
| parent | 3f8028023c3f6804751a920d97e9c8dffc575cc0 (diff) | |
staging: media: lirc: Fix missing blank line warning.
Fixes "Missing a blank line after declarations" checkpatch.pl warning in
lirc_bt829.c
Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/staging/media/lirc/lirc_bt829.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/staging/media/lirc/lirc_bt829.c b/drivers/staging/media/lirc/lirc_bt829.c index fe010542ab4b..3b52f86a4bd3 100644 --- a/drivers/staging/media/lirc/lirc_bt829.c +++ b/drivers/staging/media/lirc/lirc_bt829.c | |||
| @@ -71,6 +71,7 @@ static struct lirc_driver atir_driver; | |||
| 71 | static struct pci_dev *do_pci_probe(void) | 71 | static struct pci_dev *do_pci_probe(void) |
| 72 | { | 72 | { |
| 73 | struct pci_dev *my_dev; | 73 | struct pci_dev *my_dev; |
| 74 | |||
| 74 | my_dev = pci_get_device(PCI_VENDOR_ID_ATI, | 75 | my_dev = pci_get_device(PCI_VENDOR_ID_ATI, |
| 75 | PCI_DEVICE_ID_ATI_264VT, NULL); | 76 | PCI_DEVICE_ID_ATI_264VT, NULL); |
| 76 | if (my_dev) { | 77 | if (my_dev) { |
| @@ -96,6 +97,7 @@ static int atir_add_to_buf(void *data, struct lirc_buffer *buf) | |||
| 96 | { | 97 | { |
| 97 | unsigned char key; | 98 | unsigned char key; |
| 98 | int status; | 99 | int status; |
| 100 | |||
| 99 | status = poll_main(); | 101 | status = poll_main(); |
| 100 | key = (status >> 8) & 0xFF; | 102 | key = (status >> 8) & 0xFF; |
| 101 | if (status & 0xFF) { | 103 | if (status & 0xFF) { |
| @@ -229,6 +231,7 @@ static void do_i2c_start(void) | |||
| 229 | static void do_i2c_stop(void) | 231 | static void do_i2c_stop(void) |
| 230 | { | 232 | { |
| 231 | unsigned char bits; | 233 | unsigned char bits; |
| 234 | |||
| 232 | bits = do_get_bits() & 0xFD; | 235 | bits = do_get_bits() & 0xFD; |
| 233 | do_set_bits(bits); | 236 | do_set_bits(bits); |
| 234 | cycle_delay(1); | 237 | cycle_delay(1); |
| @@ -333,6 +336,7 @@ static unsigned char seems_rd_byte(void) | |||
| 333 | static void do_set_bits(unsigned char new_bits) | 336 | static void do_set_bits(unsigned char new_bits) |
| 334 | { | 337 | { |
| 335 | int reg_val; | 338 | int reg_val; |
| 339 | |||
| 336 | reg_val = read_index(0x34); | 340 | reg_val = read_index(0x34); |
| 337 | if (new_bits & 2) { | 341 | if (new_bits & 2) { |
| 338 | reg_val &= 0xFFFFFFDF; | 342 | reg_val &= 0xFFFFFFDF; |
| @@ -393,6 +397,7 @@ static unsigned int read_index(unsigned char index) | |||
| 393 | static void write_index(unsigned char index, unsigned int reg_val) | 397 | static void write_index(unsigned char index, unsigned int reg_val) |
| 394 | { | 398 | { |
| 395 | unsigned char __iomem *addr; | 399 | unsigned char __iomem *addr; |
| 400 | |||
| 396 | addr = pci_addr_lin + ((index & 0xFF) << 2); | 401 | addr = pci_addr_lin + ((index & 0xFF) << 2); |
| 397 | writel(reg_val, addr); | 402 | writel(reg_val, addr); |
| 398 | } | 403 | } |