Merge 3.12-rc4 into staging-next

[~andy/linux] / drivers / staging / sm7xxfb / sm7xxfb.c

diff --git a/drivers/staging/sm7xxfb/sm7xxfb.c b/drivers/staging/sm7xxfb/sm7xxfb.c
index 8add64b1cb0940f69d783083588d65994c5c0e5c..6037ec180d9056487f523f0a7d7b9da4fcaddc9e 100644 (file)
--- a/drivers/staging/sm7xxfb/sm7xxfb.c
+++ b/drivers/staging/sm7xxfb/sm7xxfb.c
@@ -259,8 +259,7 @@ static int smtc_setcolreg(unsigned regno, unsigned red, unsigned green,
                        if (sfb->fb.var.bits_per_pixel == 16) {
                                u32 *pal = sfb->fb.pseudo_palette;
                                val = chan_to_field(red, &sfb->fb.var.red);
-                               val |= chan_to_field(green, \
-                                               &sfb->fb.var.green);
+                               val |= chan_to_field(green, &sfb->fb.var.green);
                                val |= chan_to_field(blue, &sfb->fb.var.blue);
 #ifdef __BIG_ENDIAN
                                pal[regno] =
@@ -274,8 +273,7 @@ static int smtc_setcolreg(unsigned regno, unsigned red, unsigned green,
                        } else {
                                u32 *pal = sfb->fb.pseudo_palette;
                                val = chan_to_field(red, &sfb->fb.var.red);
-                               val |= chan_to_field(green, \
-                                               &sfb->fb.var.green);
+                               val |= chan_to_field(green, &sfb->fb.var.green);
                                val |= chan_to_field(blue, &sfb->fb.var.blue);
 #ifdef __BIG_ENDIAN
                                val =
@@ -508,9 +506,9 @@ static void sm7xx_set_timing(struct smtcfb_info *sfb)
 
                        /* init SEQ register SR30 - SR75 */
                        for (i = 0; i < SIZE_SR30_SR75; i++)
-                               if (((i + 0x30) != 0x62) \
-                                       && ((i + 0x30) != 0x6a) \
-                                       && ((i + 0x30) != 0x6b))
+                               if ((i + 0x30) != 0x62 &&
+                                   (i + 0x30) != 0x6a &&
+                                   (i + 0x30) != 0x6b)
                                        smtc_seqw(i + 0x30,
                                                VGAMode[j].Init_SR30_SR75[i]);
 
@@ -933,7 +931,6 @@ static void smtcfb_pci_remove(struct pci_dev *pdev)
        struct smtcfb_info *sfb;
 
        sfb = pci_get_drvdata(pdev);
-       pci_set_drvdata(pdev, NULL);
        smtc_unmap_smem(sfb);
        smtc_unmap_mmio(sfb);
        unregister_framebuffer(&sfb->fb);