Skip to content

update to Ubuntu 22.04, kernel 6.5.x #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jafrado wants to merge 1 commit into
base: master
Choose a base branch
from
Open

update to Ubuntu 22.04, kernel 6.5.x #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
# Derived from the good-ole LDD3 Makefile
#

ccflags-y += -Wall -Werror -Wunused-macros
CONFIG_MODULE_SIG=n

ccflags-y += -Wall -Werror -Wunused-macros -Wno-implicit-fallthrough

# To build modules outside of the kernel tree, we run "make"
# in the kernel source tree; the Makefile these then includes this
Expand Down
2 changes: 1 addition & 1 deletion mcp2210-irq.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ int mcp2210_irq_probe(struct mcp2210_device *dev)
for (i = 0; i < dev->nr_irqs; ++i) {
int virq = dev->irq_base + i;

dev->irq_descs[i] = irq_to_desc(virq);
dev->irq_descs[i] = irq_data_to_desc( irq_get_irq_data(virq));
BUG_ON(!dev->irq_descs[i]);
irq_set_chip_data(virq, dev);
irq_set_chip(virq, &mcp2210_irq_chip);
Expand Down
4 changes: 2 additions & 2 deletions mcp2210-lib.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1924,7 +1924,7 @@ void dump_spi_transfer(const char *level, unsigned indent, const char *start,
"%s .rx_dma = %pad\n"
"%s .cs_change = %u\n"
"%s .bits_per_word = %hhu\n"
"%s .delay_usecs = %hu\n"
"%s .word_delay_usecs = %hu\n"
"%s .speed_hz = %u\n"
"%s .transfer_list = {.next = %p, .prev = %p}\n"
"%s}\n",
Expand All @@ -1936,7 +1936,7 @@ void dump_spi_transfer(const char *level, unsigned indent, const char *start,
ind, &xfer->tx_dma,
ind, xfer->cs_change,
ind, xfer->bits_per_word,
ind, xfer->delay_usecs,
ind, xfer->word_delay.value,
ind, xfer->speed_hz,
ind, xfer->transfer_list.next, xfer->transfer_list.prev,
ind);
Expand Down
2 changes: 1 addition & 1 deletion mcp2210-spi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
# define USE_SPI_QUEUE 1
#endif

#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
#if LINUX_VERSION_CODE <= KERNEL_VERSION(3,8,0)
# define HAVE_SPI_CS_GPIO 1
#endif

Expand Down
2 changes: 1 addition & 1 deletion user/mcp2210.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -557,7 +557,7 @@ static int eeprom_write(int argc, char *argv[]) {
static int eeprom_read_write(int is_read, int argc, char *argv[]) {
struct mcp2210_ioctl_data *data;
struct mcp2210_ioctl_data_eeprom *eeprom;
const size_t struct_size = IOCTL_DATA_EEPROM_SIZE + 0x100;
const size_t struct_size = sizeof(struct mcp2210_ioctl_data);
uint addr = 0;
uint size = 0;
int i;
Expand Down