From: Antti Palosaari Date: Sat, 10 Oct 2015 16:51:07 +0000 (-0300) Subject: [media] hackrf: do not set human readable name for formats X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=36c6326c5c22054605b0425a1896542a4222d7d6;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git [media] hackrf: do not set human readable name for formats Format names are set by core nowadays. Remove name from driver. Signed-off-by: Antti Palosaari Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/usb/hackrf/hackrf.c b/drivers/media/usb/hackrf/hackrf.c index 1fee4b9041fe..e05bfec90f46 100644 --- a/drivers/media/usb/hackrf/hackrf.c +++ b/drivers/media/usb/hackrf/hackrf.c @@ -70,7 +70,6 @@ static const struct v4l2_frequency_band bands_rx_tx[] = { /* stream formats */ struct hackrf_format { - char *name; u32 pixelformat; u32 buffersize; }; @@ -78,7 +77,6 @@ struct hackrf_format { /* format descriptions for capture and preview */ static struct hackrf_format formats[] = { { - .name = "Complex S8", .pixelformat = V4L2_SDR_FMT_CS8, .buffersize = BULK_BUFFER_SIZE, }, @@ -1007,7 +1005,6 @@ static int hackrf_enum_fmt_sdr(struct file *file, void *priv, if (f->index >= NUM_FORMATS) return -EINVAL; - strlcpy(f->description, formats[f->index].name, sizeof(f->description)); f->pixelformat = formats[f->index].pixelformat; return 0;