From f1b95b71f19562a17bfc34c355efe3a86049f8bb Mon Sep 17 00:00:00 2001 From: Ji Zhang Date: Thu, 4 Jan 2018 16:53:50 +0100 Subject: fbdev: arm64 use __raw I/O memory api Since arm64 also has __raw I/O accessors, add __aarch64__ in fb.h. This is a supplement for commmit 981409b25e2a ("fbdev: arm has __raw I/O accessors, use them in fb.h"). Signed-off-by: Ji Zhang Cc: Matthias Brugger Signed-off-by: Bartlomiej Zolnierkiewicz --- include/linux/fb.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/linux/fb.h b/include/linux/fb.h index bc24e48e396d..cea8a2c39034 100644 --- a/include/linux/fb.h +++ b/include/linux/fb.h @@ -564,7 +564,10 @@ static inline struct apertures_struct *alloc_apertures(unsigned int max_num) { #define fb_memcpy_fromfb sbus_memcpy_fromio #define fb_memcpy_tofb sbus_memcpy_toio -#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || defined(__avr32__) || defined(__bfin__) || defined(__arm__) +#elif defined(__i386__) || defined(__alpha__) || defined(__x86_64__) || \ + defined(__hppa__) || defined(__sh__) || defined(__powerpc__) || \ + defined(__avr32__) || defined(__bfin__) || defined(__arm__) || \ + defined(__aarch64__) #define fb_readb __raw_readb #define fb_readw __raw_readw -- cgit v1.2.3 From 84df64956bf4d71a831a4cac5fca5b1985eba654 Mon Sep 17 00:00:00 2001 From: Ladislav Michl Date: Mon, 15 Jan 2018 17:04:21 +0100 Subject: video: udlfb: Remove redundant gdev variable gdev is not really needed as the same content can be read from udev->dev. Signed-off-by: Ladislav Michl Cc: Bernie Thompson Signed-off-by: Bartlomiej Zolnierkiewicz --- include/video/udlfb.h | 1 - 1 file changed, 1 deletion(-) (limited to 'include') diff --git a/include/video/udlfb.h b/include/video/udlfb.h index 1252a7a89bc0..7b4f567dd1fe 100644 --- a/include/video/udlfb.h +++ b/include/video/udlfb.h @@ -35,7 +35,6 @@ struct urb_list { struct dlfb_data { struct usb_device *udev; - struct device *gdev; /* &udev->dev */ struct fb_info *info; struct urb_list urbs; struct kref kref; -- cgit v1.2.3 From 7ea46206d1706bffa1b4785fe47a530de4c57597 Mon Sep 17 00:00:00 2001 From: Ladislav Michl Date: Mon, 15 Jan 2018 17:04:22 +0100 Subject: video: udlfb: Do not name private data 'dev' Variable 'dev' is usually used for 'struct device'. Therefore rename driver private data to dlfb to avoid confusion once driver will be using dev_*() logging functions. Signed-off-by: Ladislav Michl Cc: Bernie Thompson Signed-off-by: Bartlomiej Zolnierkiewicz --- include/video/udlfb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/video/udlfb.h b/include/video/udlfb.h index 7b4f567dd1fe..0cabe6b09095 100644 --- a/include/video/udlfb.h +++ b/include/video/udlfb.h @@ -19,7 +19,7 @@ struct dloarea { struct urb_node { struct list_head entry; - struct dlfb_data *dev; + struct dlfb_data *dlfb; struct delayed_work release_urb_work; struct urb *urb; }; -- cgit v1.2.3